add an entry in NEWS

This reverts commit 3fa01ef7a9.

.gitignore

@@ -1,14 +1,17 @@
-# generated files by 'configure'
-src/Makefile
-src/config.h
-src/gnuk.ld
 *.lst
 *.o
 *.pyc
 src/.dep
+src/Makefile
+src/config.h
+src/gnuk.ld
 src/gnuk.bin
 src/gnuk.dmp
 src/gnuk.elf
 src/gnuk.hex
 src/gnuk.map
-src/random_bits
+src/*.inc
+regnual/regnual.bin
+regnual/regnual.hex
+regnual/regnual.elf
+doc/_build

AUTHORS

@@ -37,32 +37,39 @@ NIIBE Yutaka:
     Wrote a tool for Gnuk:
 	tool/gnuk_put_binary.py
 	tool/gnuk_put_binary_libusb.py
+	tool/gnuk_remove_keys.py
+	tool/gnuk_upgrade.py
     Wrote a tool for USB Hub:
 	tool/hub_ctrl.py
-    Wrote:
+    Wrote a tool for testing card reader with pinpad:
+	tool/pinpadtest.py
+    Wrote reGNUal implementation:
+	regnual/regnual.c
+	regnual/sys.c
+    Wrote Gnuk implementation:
 	gnuk.svg
 	src/configure
 	src/ac.c
-	src/main.c
-	src/usb_lld.h
-	src/gnuk.h
-	src/usb_lld.c
-	src/usb-icc.c
-	src/openpgp-do.c
-	src/flash.c
-	src/debug.c
-	src/usb_desc.c
-	src/usb-cdc-vport.c
-	src/hardclock.c
-	src/openpgp.h
-	src/openpgp.c
 	src/call-rsa.c
-	src/random.c
+	src/debug.c
+	src/flash.c
+	src/gnuk.h
+	src/main.c
+	src/neug.c
+	src/openpgp-do.c
+	src/openpgp.c
+	src/openpgp.h
 	src/pin-cir.c
 	src/pin-dial.c
 	src/pin-dnd.c
-	src/usb_msc.c
-	src/usb_msc.h
-	src/neug.c
+	src/random.c
+	src/sys.c
+	src/usb-icc.c
+	src/usb-msc.c
+	src/usb-msc.h
+	src/usb_ctrl.c
+	src/usb_desc.c
+	src/usb_lld.c
+	src/usb_lld.h
 	*
 	and others.

ChangeLog

@@ -1,3 +1,957 @@
+2012-07-21  Niibe Yutaka  <gniibe@fsij.org>
+
+	* Version 1.0.
+	* src/usb_desc.c (gnukStringSerial): Updated.
+
+	Documentation by Sphinx.
+	* doc/Makefile: New.
+	* doc/note: Old notes are moved here.
+
+2012-07-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* test/features/002_get_data_static.feature: Support CERTDO enabled
+	Gnuk for the test of extended capabilities.
+	* test/features/802_get_data_static.feature: Ditto.
+	* test/features/402_get_data_static.feature: Ditto.
+
+2012-07-10  Niibe Yutaka  <gniibe@fsij.org>
+
+	* test/features/*: Add test cases for PW1/PW3 of factory settings.
+
+	* test/features/202_keygen.feature: Add PSO signature test after
+	keygen.
+	* test/features/602_keygen.feature: Ditto.
+
+	Bug fix.
+	* src/openpgp-do.c (gpg_do_write_prvkey): Don't call ac_reset_*
+	here.
+	(proc_key_import): But call ac_reset_* here.
+	(gpg_do_keygen): Load private key for signing.
+
+	* tool/stlinkv2.py (stlinkv2.usb_disconnect): New.
+
+2012-07-09  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (cmd_pso): For decryption, return error sooner for
+	invalid data.
+
+	* tool/stlinkv2.py (stlinkv2.setup_gpio): Fix GPIOB_CRL.
+
+	* test/rsa_keys.py (integer_to_bytes_256): Rename from
+	integer_to_bytes and it should be exactly 256-byte long.
+
+2012-07-06  Niibe Yutaka  <gniibe@fsij.org>
+
+	* Version 0.21.
+	* src/usb_desc.c (gnukStringSerial): Updated.
+
+	* boards/FST_01/board.h (VAL_GPIOACRL): Change for SPI flash.
+	* tool/stlinkv2.py (stlinkv2.setup_gpio): Likewise.
+	(stlinkv2.spi_flash_init, stlinkv2.spi_flash_select)
+	(stlinkv2.spi_flash_sendbyte, stlinkv2.spi_flash_read_id): New.
+	(main): Add SPI flash ROM id check.
+
+2012-07-05  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/call-rsa.c (rsa_sign, rsa_decrypt): Don't need to setup N.
+
+	* polarssl-0.14.0/library/rsa.c (rsa_check_pubkey)
+	(rsa_check_privkey): Ifdef-out.
+
+	More tests.
+	* test/*: Add tests for admin-less mode.
+	* test/features/990_reset_passphrase.feature: This is now for
+	admin-less mode.
+	* test/features/970_key_removal.feature: Ditto.
+
+	* src/openpgp.c (cmd_change_password): Call ac_reset_admin when
+	admin-less mode.
+	(cmd_reset_user_password): Likewise.
+
+	* src/ac.c (ac_reset_admin, ac_fini): Clear ADMIN_AUTHORIZED.
+
+	Bug fix.
+	* src/ac.c (verify_admin): Call s2k with ADMIN_AUTHORIZED.
+
+2012-07-04  Niibe Yutaka  <gniibe@fsij.org>
+
+	Bug fixes.
+	* src/ac.c (verify_admin_0): Compare PW_LEN and BUF_LEN.
+
+	* src/openpgp-do.c (gpg_do_chks_prvkey): Set do_ptr to NULL before
+	calling flash_do_write (which might cause GC).
+	(gpg_do_put_data, gpg_do_write_simple): Likewise.
+
+	* src/openpgp.c (cmd_reset_user_password): Write to
+	DO_KEYSTRING_PW1.
+
+2012-07-03  Niibe Yutaka  <gniibe@fsij.org>
+
+	* test/features/040_passphrase_change.feature: New.
+	* test/features/203_passphrase_change.feature: New.
+	* test/features/210_compute_signature.feature: Rename (was:
+	203_compute_signature.feature)
+	* test/features/211_decryption.feature: Rename (was:
+	204_decryption.feature)
+
+2012-07-02  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/stlinkv2.py (stlinkv2.__init__): Don't call setAltInterface.
+
+2012-06-30  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (s2k): New.
+	(resetcode_s2k): Remove.
+	(cmd_reset_user_password, cmd_change_password): Use s2k (was:
+	sha256 directly or resetcode_s2k).
+	* src/openpgp-do.c (proc_resetting_code, gpg_do_write_prvkey):
+	Likewise.
+	* src/ac.c (verify_user_0, verify_admin): Likewise.
+
+2012-06-29  Niibe Yutaka  <gniibe@fsij.org>
+
+	* regnual/Makefile: Don't copy usb_lld.c.
+
+2012-06-28  Niibe Yutaka  <gniibe@fsij.org>
+
+	* test/features/204_decryption.feature: New.
+	* test/features/203_compute_signature.feature: New.
+	* test/features/202_keygen.feature: New.
+	* test/features/201_setup_passphrase.feature: New.
+	* test/features/200_key_removal.feature: New.
+
+	* test/rsa_keys.py (verify_signature): New.
+	(encrypt_with_pubkey): New.
+
+	* test/gnuk.py (gnuk_token): New method: increment_seq.
+	(gnuk_token.icc_send_cmd): Handle timeout.
+	(gnuk_token.cmd_genkey): New.
+	(gnuk_token.cmd_get_public_key): New.
+
+2012-06-27  Niibe Yutaka  <gniibe@fsij.org>
+
+	* test/features/101_decryption.feature: New.
+	* test/features/100_compute_signature.feature: New.
+
+	* src/openpgp-do.c (gpg_do_chks_prvkey): Call flash_do_release before
+	flash_do_write.
+	(gpg_do_write_prvkey): Bug fix when GC occurs.
+
+	* src/openpgp.c (cmd_change_password): Support resetting to
+	factory setting of PW3.
+
+	* src/openpgp-do.c (gpg_do_write_prvkey): Don't reset signagure
+	counter here.
+	(proc_key_import): But reset here.
+	Call ac_reset_* when key is imported.
+
+2012-06-26  Niibe Yutaka  <gniibe@fsij.org>
+
+	* test: New.
+
+2012-06-25  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/usb_strings.py: New.
+
+2012-06-22  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/stlinkv2.py (stlinkv2.blank_check): Add blank check of
+	Flash ROM.
+
+2012-06-21  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/asm-thumb/blank_check.S: New.
+
+2012-06-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	ST-Link/V2 flash ROM writer.
+	* tool/stlinkv2.py: New.
+	* tool/asm-thumb/opt_bytes_write.S: New.
+	* tool/asm-thumb/flash_write.S: New.
+
+2012-06-19  Niibe Yutaka  <gniibe@fsij.org>
+
+	* Version 0.20.
+
+	* src/usb_desc.c (gnukStringSerial): Updated.
+
+2012-06-18  Niibe Yutaka  <gniibe@fsij.org>
+
+	LED display output change.
+	* src/main.c (MAIN_TIMEOUT_INTERVAL): New.
+	(LED_TIMEOUT_INTERVAL, etc.): New values.
+	(main_mode, display_interaction): Remove.
+	(led_inverted, emit_led): New.
+	(display_status_code): Use emit_led.
+	(led_blink): Use LED_* for SPEC.
+	(main, fatal): New LED display output.
+	* src/gnuk.h (LED_ONESHOT, LED_TWOSHOTS, LED_SHOW_STATUS)
+	(LED_START_COMMAND, LED_FINISH_COMMAND, LED_FATAL): New semantics.
+	(main_thread): Remove.
+	* src/openpgp-do.c (gpg_do_keygen): Don't touch LED here.
+	* src/openpgp.c (get_pinpad_input): Call led_blink.
+	(cmd_pso, cmd_internal_authenticate): Don't touch LED here.
+	(GPGthread): Call led_blink.
+	* src/pin-cir.c (pinpad_getline): Change arg of led_blink.
+	* src/pin-dnd.c (pinpad_getline): Ditto.
+	* src/usb-icc.c (icc_handle_timeout): Ditto.
+	(icc_send_status): Call led_blink.
+	* src/usb_ctrl.c (gnuk_usb_event): Don't touch LED here.
+
+2012-06-16  Niibe Yutaka  <gniibe@fsij.org>
+
+	Use SHA256 format for "external authenticate".
+	* tool/gnuk_upgrade.py (gpg_sign): SHA256 sign by "SCD PKAUTH".
+	(main): Not specify keygrip, but always use key for authentication.
+	* src/call-rsa.c (rsa_verify): It is SHA256 format (was: SHA1).
+	* src/openpgp.c (cmd_get_challenge): Don't add chip-id prefix.
+	(cmd_external_authenticate): Likewise.
+
+2012-06-15  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/random.c (random_bytes_free): Clear out random bytes.
+
+	More protection improvements.
+	* src/random.c (RANDOM_BYTES_LENGTH): It's 32 now (was: 16).
+	* src/gnuk.h (struct key_data_internal): Remove check, random,
+	magic.  Add checksum.
+	(struct prvkey_data): Remove crm_encrypted.  Add iv and
+	checksum_encrypted.
+	* src/openpgp-do.c (encrypt, decrypt): Add IV argument.
+	(encrypt_dek, decrypt_dek): New.  It's in ECB mode.
+	(compute_key_data_checksum): New.
+	(gpg_do_load_prvkey): Handle initial vector and checksum.
+	Use decrypt_dek to decrypt DEK.  Clear DEK after use.
+	(calc_check32):Remove.
+	(gpg_do_write_prvkey): Use encrypt_dek to encrypt DEK.
+	(gpg_do_chks_prvkey): Likewise.
+
+	* polarssl-0.14.0/include/polarssl/aes.h (aes_crypt_cbc)
+	* polarssl-0.14.0/library/aes.c (aes_crypt_cbc): ifdef-out.
+
+	* src/configure (--enable-pinpad): Deprecate DND.
+
+2012-06-14  Niibe Yutaka  <gniibe@fsij.org>
+
+	Protection improvement.
+	* src/openpgp.c (resetcode_s2k): New.
+	(cmd_reset_user_password): Use resetcode_s2k.
+	* src/openpgp-do.c (proc_resetting_code): Likewise.
+
+	* src/sha256.c (sha256_finish): Clear out CTX at the end.
+
+	* src/call-rsa.c (rsa_sign, rsa_decrypt, rsa_verify): Use
+	mpi_lset (was: mpi_read_string).
+	* polarssl-0.14.0/library/bignum.c (mpi_get_digit)
+	(mpi_read_string): ifdef-out.
+
+	KDF is now SHA-256 (was: SHA1).
+	* src/sha256.c: New file.  Based on the implementation by Dr Brian
+	Gladman.
+	* src/openpgp.c (cmd_change_password, cmd_reset_user_password):
+	Use sha256.
+	* src/openpgp-do.c (proc_resetting_code, gpg_do_write_prvkey): Likewise.
+	* src/ac.c (verify_user_0, calc_md, verify_admin): Likewise.
+	* src/crypt.mk (CRYPTSRC): Add sha256.c, removing sha1.c.
+	* src/gnuk.h (KEYSTRING_MD_SIZE): It's 32 for SHA-256.
+
+2012-06-13  Niibe Yutaka  <gniibe@fsij.org>
+
+	Bug fixes.
+	* src/main.c (display_interaction): Assign to main_mode.
+	* src/openpgp.c (cmd_change_password): Bug fix for admin less mode
+	to admin full mode.  Variable who_old should be admin_authorized.
+
+	Key generation is configure option.
+	* src/configure (keygen): Add --enable-keygen option.
+	* src/Makefile.in (UDEFS): Add definition of KEYGEN_SUPPORT.
+	* src/call-rsa.c [KEYGEN_SUPPORT] (rsa_genkey): Conditionalize.
+	* src/random.c [KEYGEN_SUPPORT] (random_byte): Ditto.
+	* src/openpgp.c [KEYGEN_SUPPORT] (cmd_pgp_gakp): Ditto.
+	* src/openpgp-do.c [KEYGEN_SUPPORT] (gpg_do_keygen): Ditto.
+	* polarssl-0.14.0/include/polarssl/config.h: Ditto.
+	* polarssl-0.14.0/library/bignum.c [POLARSSL_GENPRIME]
+	(mpi_inv_mod): Unconditionalize.
+
+2012-06-08  Niibe Yutaka  <gniibe@fsij.org>
+
+	* polarssl-0.14.0/library/bignum.c (mpi_cmp_mpi): Bug fix.
+	Though it doesn't matter for Gnuk usage.
+
+	Emit LED light while computation (or asking user input).
+	* src/usb-icc.c (icc_handle_timeout): Call led_blink.
+	* src/openpgp.c (cmd_pso, cmd_internal_authenticate): Call
+	LED_WAIT_MODE, LED_STATUS_MODE to show "it's under computation".
+	* src/openpgp-do.c (gpg_do_keygen): Ditto.
+	* src/gnuk.h (LED_WAIT_MODE): Rename (was: LED_INPUT_MODE).
+	* src/main.c (display_interaction): Change the behavior of LED,
+	now, it's mostly ON (was: mostly OFF).
+
+2012-06-07  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (cmd_internal_authenticate): Add check for input
+	length.
+
+	Implement key generation.
+	* src/openpgp.c (cmd_pgp_gakp): Call gpg_do_keygen.
+	* src/openpgp-do.c (proc_key_import): Call with modulus = NULL.
+	(gpg_do_keygen): New function.
+	(gpg_reset_digital_signature_counter): New function.
+	(gpg_do_write_prvkey): New argument MODULUS.  Call
+	gpg_reset_digital_signature_counter.
+	* src/call-rsa.c (rsa_genkey): New function.
+	* src/random.c (random_byte): New function.
+
+	PolarSSL modification.
+	* polarssl-0.14.0/library/rsa.c (rsa_gen_key): Don't set D, DP,
+	DQ, and QP.  It's only for key generation.
+	* polarssl-0.14.0/library/rsa.c (rsa_gen_key, rsa_pkcs1_encrypt):
+	Change f_rng function return type.
+	* polarssl-0.14.0/include/polarssl/rsa.h: Likewise.
+	* polarssl-0.14.0/library/bignum.c (mpi_is_prime, mpi_gen_prime):
+	Change f_rng function return type.
+	* polarssl-0.14.0/include/polarssl/bignum.h: Likewise.
+
+2012-06-06  Niibe Yutaka  <gniibe@fsij.org>
+
+	* Version 0.19.
+
+	* src/usb_desc.c (gnukStringSerial): Updated.
+
+	* regnual/regnual.c (fetch): Better implementation.
+
+2012-06-05  Niibe Yutaka  <gniibe@fsij.org>
+
+	Firmware update key handling.
+	* tool/gnuk_put_binary.py (GnukToken.cmd_get_response): Handle
+	larger data such as card holder certificate.
+	(GnukToken.cmd_write_binary): Bug fix for cert do write.
+	(GnukToken.cmd_read_binary): New.
+	(main): Support firmware update key.
+
+	Take advantage of the Thumb-2 "rbit" instruction.
+	* regnual/regnual.c (fetch): Reverse bits.
+	* src/usb_ctrl.c (rbit): New.  Deleted reverse32.
+	(download_check_crc32): Use rbit.
+	* tool/gnuk_upgrade.py (crc32): Just use binascii.crc32.
+	(crctab): Remove.
+
+2012-06-04  Niibe Yutaka  <gniibe@fsij.org>
+
+	Card holder certificate data object bug fixes.
+	* tool/gnuk_put_binary_libusb.py (gnuk_token.cmd_get_response):
+	Handle larger data such as card holder certificate.
+	* src/flash.c (flash_write_binary): Bug fix.  Call
+	flash_check_blank with p + offset.
+	* src/gnuk.h (FLASH_CH_CERTIFICATE_SIZE): Define here (was: flash.c).
+
+	Implement CRC32 check for firmware update.
+	* src/usb_ctrl.c (download_check_crc32): New.
+	* regnual/regnual.c (calc_crc32): New.
+	(regnual_ctrl_write_finish): Call calc_crc32.
+	* tool/gnuk_upgrade.py (crc32): New.
+	(regnual.download): Check crc32code.
+
+	* regnual/regnual.c (regnual_ctrl_write_finish): Bug fix.
+
+2012-06-01  Niibe Yutaka  <gniibe@fsij.org>
+
+	Support firmware update with public key authentication.
+	* tool/gnuk_upgrade.py (gpg_sign): New.
+	* tool/gnuk_put_binary_libusb.py (main): Support firmware update
+	key registration.
+
+	Update of reGNUal.
+	* regnual/regnual.c (main): Follow the change of usb_lld_init.
+	(regnual_config_desc): Include interface descriptor.
+	(usb-strings.c.inc): Change the file name.
+	* regnual/Makefile (regnual.o): Depend on sys.h.
+	* src/configure (usb-strings.c.inc): ifdef-out
+	gnuk_revision_detail and gnuk_config_options (for reGNUal).
+	* src/usb_desc.c (USB_STRINGS_FOR_GNUK): Define.
+
+	USB bug fixes.
+	* src/usb_ctrl.c (gnuk_usb_event): Bug fix for handling
+	USB_EVENT_CONFIG.  Do nothing when current_conf == value.
+	* src/usb_lld.c (std_clear_feature): Bug fix.  Always clear DTOG.
+	(usb_lld_init): New argument for FEATURE.
+
+2012-05-31  Niibe Yutaka  <gniibe@fsij.org>
+
+	* polarssl-0.14.0/library/rsa.c (rsa_pkcs1_verify): BUF size is
+	256 (was: 1024).
+	* src/call-rsa.c (rsa_verify): It's SIG_RSA_SHA1.
+	* src/openpgp.c (cmd_external_authenticate): Follow the change of
+	rsa_verify.
+
+	Support "firmware update" keys.
+	* src/flash.c (flash_write_binary): Support update keys.
+	* src/gnuk.h (FILEID_UPDATE_KEY_0, FILEID_UPDATE_KEY_1)
+	(FILEID_UPDATE_KEY_2,FILEID_UPDATE_KEY_3): New.
+	* src/gnuk.ld.in (_updatekey_store): New.
+	* src/openpgp.c (FILE_EF_UPDATE_KEY_0, FILE_EF_UPDATE_KEY_1)
+	(FILE_EF_UPDATE_KEY_2, FILE_EF_UPDATE_KEY_3): New.
+	(gpg_get_firmware_update_key): New.
+	(cmd_read_binary): Support update keys and certificate.
+	(modify_binary): New.
+	(cmd_update_binary, cmd_write_binary): Use modify_binary.
+	(cmd_external_authenticate): Support up to four keys.
+
+	Version string of system service is now USB string.
+	* src/sys.h (unique_device_id): Define here, not as system
+	service.
+	* src/sys.c (sys_version): Version string for system service.
+	* src/usb_desc.c (String_Descriptors): Add sys_version.
+	* src/usb_conf.h (NUM_STRING_DESC): 7 (was: 6).
+	* src/gnuk.ld.in (.sys.version): New section.
+
+2012-05-30  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (CHALLENGE_LEN): New.
+	(cmd_external_authenticate): Authentication by response with
+	public key.
+	(cmd_get_challenge): 16-byte is enough for challenge.
+
+2012-05-29  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/call-rsa.c (rsa_verify): New function.
+
+	* polarssl-0.14.0/include/polarssl/rsa.h (rsa_pkcs1_verify)
+	* polarssl-0.14.0/library/rsa.c (rsa_pkcs1_verify): Fix API.
+
+	* src/usb_conf.h (NUM_STRING_DESC): Incremented to 6 (was: 4).
+	* src/configure: Generate strings for revision detail and config
+	options.
+	* src/usb_desc.c (gnuk_revision_detail, gnuk_config_options): New.
+
+	* src/main.c (main) [DFU_SUPPORT]: Kill DFU and install .sys.
+
+	* src/config.h.in (FLASH_PAGE_SIZE): New.
+	* src/configure: Support FLASH_PAGE_SIZE for config.h
+	* boards/*/board.h (FLASH_PAGE_SIZE): Remove.
+	* src/flash.c (FLASH_PAGE_SIZE): Remove.
+
+	* src/sys.c (reset): Don't depend if DFU_SUPPORT or not.
+	(flash_erase_all_and_exec): Rename and change the argument.
+	* src/gnuk.ld.in (__flash_start__): Real flash ROM address,
+	regardless of DFU_SUPPORT.
+	* src/main.c (main): Call flash_erase_all_and_exec with SRAM
+	address.
+
+	* polarssl-0.14.0/library/aes.c (FT0, FT1, FT2): Specify sections
+	in detail, so that addresses won't be affected by compiler.
+	* src/gnuk.ld.in (.sys): Define sections in detail.
+
+	* boards/STBEE_MINI/board.h (SET_USB_CONDITION, GPIO_USB)
+	(IOPORT_USB, SET_LED_CONDITION, GPIO_LED, IOPORT_LED)
+	(FLASH_PAGE_SIZE): New.
+	* boards/STBEE_MINI/board.c (USB_Cable_Config, set_led): Remove.
+
+	* boards/STBEE/board.h (SET_USB_CONDITION, GPIO_USB, IOPORT_USB)
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/STBEE/board.c (USB_Cable_Config, set_led): Remove.
+
+	* boards/CQ_STARM/board.h (SET_USB_CONDITION)
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/CQ_STARM/board.c (USB_Cable_Config, set_led): Remove.
+
+2012-05-28  Niibe Yutaka  <gniibe@fsij.org>
+
+	* boards/*/board.c (hwinit0): Removed...
+	* boards/common/hwinit.c (hwinit0): ... and define here.
+	(hwinit0) [DFU_SUPPORT]:  Don't set SCB->VTOR here.
+	* src/sys.c (reset) [DFU_SUPPORT]: Set SCB->VTOR here.
+	(flash_write): Range check.
+
+	* polarssl-0.14.0/library/aes.c (FT0, FT1, FT2): Specify the
+	section ".sys", so that we will have more room for flash ROM.
+	* src/gnuk.ld.in (.sys): Add alignment settings.
+
+	* tool/gnuk_upgrade.py (main): First 4096-byte of Gnuk is system
+	block.  Don't send it to reGNUal.
+
+	* regnual/sys.c (entry): Fix clearing BSS.  It is called with all
+	interrupts disabled.
+
+	* regnual/regnual.ld (_flash_start): It's 0x08001000 now, because
+	there is system block now (was: 0x08000000).
+
+2012-05-26  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/sys.c (reset): Set SCR->VCR here.
+
+2012-05-25  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/gnuk.ld.in (.sys): New section.
+
+	* boards/OLIMEX_STM32_H103/board.h (SET_USB_CONDITION, GPIO_USB)
+	(IOPORT_USB, SET_LED_CONDITION, GPIO_LED, IOPORT_LED)
+	(FLASH_PAGE_SIZE): New.
+	* boards/OLIMEX_STM32_H103/board.c (USB_Cable_Config, set_led):
+	Remove.
+
+	* boards/STM32_PRIMER2/board.h (SET_USB_CONDITION, GPIO_USB)
+	(IOPORT_USB, SET_LED_CONDITION, GPIO_LED, IOPORT_LED)
+	(FLASH_PAGE_SIZE): New.
+	* boards/STM32_PRIMER2/board.c (USB_Cable_Config, set_led):
+	Remove.
+
+	* boards/FST_01_00/board.h (SET_USB_CONDITION, GPIO_USB)
+	(IOPORT_USB, SET_LED_CONDITION, GPIO_LED, IOPORT_LED)
+	(FLASH_PAGE_SIZE): New.
+	* boards/FST_01_00/board.c (USB_Cable_Config, set_led): Remove.
+
+	* boards/FST_01/board.h (SET_USB_CONDITION, GPIO_USB, IOPORT_USB)
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/FST_01/board.c (USB_Cable_Config, set_led): Remove.
+
+	* regnual/sys-stm8s-discovery.h, sys-stbee.h: Remove.
+
+	* boards/STM8S_DISCOVERY/board.h (SET_USB_CONDITION)
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/STM8S_DISCOVERY/board.c (USB_Cable_Config, set_led):
+	Remove.
+
+	* regnual/Makefile: Add -I ../src to CFLAGS.
+
+	* regnual/regnual.ld (vector): New.
+
+	* regnual/sys.c: Remove implementation, but jump to vector by sys.h.
+
+	* src/Makefile.in: Follow change of files.
+
+	* src/configure: Undo changes of 2012-05-22.
+
+	* boards/common/hw_config.c: Remove.  Mov function to sys.c.
+	* src/flash.c: Move functions to sys.c.
+	* src/sys.c: New.
+
+	* src/main.c (main): Call flash_mass_erase_and_exec.
+
+	* src/usb_lld.c: Include sys.h.
+
+	* src/usb_lld_sys.c: Remove.  Move interrupt handler to...
+	* src/usb_ctrl.c: ... this file.
+
+	* regnual/sys.c (clock_init, gpio_init, flash_unlock): Removed.
+	(entry): Rename (was: reset).
+
+2012-05-24  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/main.c (good_bye): Care LSB of function pointer.
+	(flash_mass_erase_and_exec): Implemented in C.
+
+2012-05-23  Niibe Yutaka  <gniibe@fsij.org>
+
+	* regnual/sys-stm8s-discovery.h: New.
+
+	* src/main.c (flash_mass_erase_and_exec, good_bye): New.
+	(main): Call good_bye.
+
+	* tool/gnuk_upgrade.py (regnual.protect): New.
+	(main): Call regnual.protect().
+
+	* regnual/regnual.c (regnual_setup): Don't call flash_write here.
+	(regnual_ctrl_write_finish): But call here.
+	(USB_REGNUAL_RESULT): New.
+
+	* regnual/sys.c (flash_protect): New.
+
+2012-05-22  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure (../regnual/sys.h): Create symblic link.
+
+	* src/usb_ctrl.c: Rename (was: usb_prop.c).
+
+	* regnual/types.h, regnual/sys.c, regnual/regnual.ld: New.
+	* regnual/regnual.c, regnual/Makefile: New.
+	* regnual/sys-stbee.h: New.
+
+	* src/usb_lld.c: Support FREE_STANDING environment as well as
+	under ChibiOS/RT.
+	(usb_lld_init): Call usb_lld_sys_init.  Don't call user defined
+	method.  Call usb_lld_set_configuration.
+	(usb_lld_shutdown): Call usb_lld_sys_shutdown.
+	(Vector90): Move to usb_lld_sys.c.
+	(usb_interrupt_handler): Export to global.
+
+	* src/usb_lld_sys.c: New.
+
+	* src/usb_prop.c (Device_Method): Remove gnuk_device_init.
+	(gnuk_device_init): Remove.
+
+2012-05-19  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/usb_lld.c (handle_datastage_in): Bug fix, erable RX when
+	sending ZLP.  It will be possible to get OUT transaction soon
+	after IN transaction.
+
+2012-05-18  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/usb_lld.c (handle_datastage_out): Fix rx copying.
+	(handle_setup0): Bug fix not stalling TX, it will be possible
+	to go IN transaction, soon after OUT transaction.
+
+	* src/usb_lld.h (USB_SETUP_SET, USB_SETUP_GET): New.
+	(usb_device_method.ctrl_write_finish): New.
+	(usb_device_method.setup): Merge setup_with_data, and
+	setup_with_nodata.
+
+	* src/usb_lld.c (usb_lld_shutdown, usb_lld_prepare_shutdown): New.
+	(handle_setup0): Call ->setup.
+	(handle_in0): Call ->ctrl_write_finish.
+
+	* src/usb_prop.c (vcom_port_data_setup): Merge
+	vcom_port_setup_with_nodata.
+	(download_check_crc32): New.
+	(gnuk_setup): Merge gnuk_setup_with_data and
+	gnuk_setup_with_nodata.
+	(gnuk_ctrl_write_finish): New.
+
+2012-05-17  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/gnuk_upgrade.py: New tool.
+
+	* src/gnuk.h (ICC_STATE_EXITED, ICC_STATE_EXEC_REQUESTED): New.
+
+	* src/openpgp.c (INS_EXTERNAL_AUTHENTICATE)
+	(cmd_external_authenticate): New.
+	(INS_GET_CHALLENGE, cmd_get_challenge): New.
+
+	* src/usb-icc.c (USBthread): Finish the thread with
+	ICC_STATE_EXITED, after EXTERNAL_AUTHENTICATE.
+
+	* src/usb_prop.c (gnuk_setup_endpoints_for_interface): Add STOP
+	argument.
+	(gnuk_usb_event): Disable all endpoints when configure(0).
+	(vcom_port_data_setup): Check direction and support
+	USB_CDC_REQ_SET_LINE_CODING.
+	(vcom_port_setup_with_nodata): Check direction.
+	(gnuk_setup_with_data): Check direction and add FSIJ_GNUK device
+	requests.
+	(gnuk_setup_with_nodata): Likewise.
+
+	* src/usb_lld.c (LAST_OUT_DATA): Remove.
+	(handle_datastage_out): Cleanup and call st103_ep_set_rxtx_status.
+	(handle_datastage_in): Call st103_ep_set_rxtx_status and
+	st103_ep_set_tx_status.
+	(handle_setup0): Likewise.
+	(handle_out0): Remove LAST_OUT_DATA.
+	(std_none, std_get_status, std_clear_feature, std_set_feature)
+	(std_set_address, std_get_descriptor, std_get_configuration)
+	(std_set_configuration, std_get_interface, std_set_interface):
+	Check direction.
+	(handle_setup0): Add length for setup_with_data.
+
+2012-05-16  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/gnuk_put_binary.py (main): Fix fileid.
+	* tool/gnuk_put_binary_libusb.py: Ditto.
+
+	* src/openpgp.c (FILE_EF_RANDOM): Remove.
+	(cmd_update_binary, cmds): ifdef CERTDO_SUPPORT.
+	(cmd_write_binary): Fix fileid.
+
+	* src/flash.c (flash_check_blank): Always enable.
+	(flash_erase_binary): ifdef CERTDO_SUPPORT.
+	(flash_write_binary): Call flash_check_blank.
+
+2012-05-15  Niibe Yutaka  <gniibe@fsij.org>
+
+	* Version 0.18.
+
+	* src/usb_desc.c (gnukStringSerial): Updated.
+
+	* src/main.c (EP3_IN_Callback, EP5_OUT_Callback): Move from
+	usb_endp.c.
+
+	* src/usb_endp.c: Remove.
+
+2012-05-14  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/gnuk_remove_keys.py: New.
+
+	* src/openpgp-do.c (proc_key_import): Fix checking extended header.
+
+	* src/hardclock.c: Remove.
+
+	* src/usb_prop.c (MSC_INTERFACE_NO): New.
+	(gnuk_setup_endpoints_for_interface): Cleanup with MSC_INTERFACE_NO.
+	(gnuk_setup_with_data, gnuk_setup_with_nodata): Likewise.
+
+	* src/usb-msc.c: Rename from usb_msc.c.
+
+	* src/usb-msc.h: Rename from usb_msc.h.
+
+	* src/Makefile.in: Follow the rename of usb-msc.c and remove of
+	hardclock.c.
+
+	* src/pin-dnd.c, src/usb_prop.c: Follow the rename of usb-msc.h.
+
+2012-05-12  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/usb_msc.c (ep6_out): Rename (was: ep7_out).
+	(usb_start_receive): Use ep6_out and ENDP6.
+	(EP6_OUT_Callback): Rename (was: EP7_OUT_Callback).
+	Use ep6_out and ENDP6.
+	(msc_handle_command): Use ep6_out and ENDP6.
+
+	* src/main.c (main): Wait USB reset.
+
+	* src/usb-icc.c (EP1_OUT_Callback): Rename from EP2_OUT_Callback.
+	(USBthread): Use ENDP1 for both of epi_init and epo_init.
+
+	* src/usb_conf.h (ENDP1_RXADDR, ENDP2_TXADDR, ENDP6_RXADDR): New.
+	(ENDP3_TXADDR, ENDP4_TXADDR, ENDP5_RXADDR): New value.
+	(ENDP7_RXADDR): Remove.
+
+	* src/usb_desc.c (gnukConfigDescriptor): Use endpoint OUT1 (was
+	IN2), endpoint OUT6 (IN7).
+
+	* src/usb_prop.c (gnuk_setup_endpoints_for_interface): Use ENDP1
+	and ENDP6 for both directions.
+
+2012-05-11  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure (--vidpid): New mandatory option.
+
+	* GNUK_USB_DEVICE_ID: New file.
+
+	* src/usb_desc.c (gnukDeviceDescriptor): Include
+	usb-vid-pid-ver.c.inc.
+	(gnukStringVendor, gnukStringProduct): Remove.  It's in the
+	file, usb-string-vender-product.c.inc.
+
+	* src/Makefile.in (distclean): Delete *.inc.
+
+	* src/usb_prop.c (vcom_port_setup_with_nodata) Rename.
+	(vcom_port_data_setup): Rename and fix return value.
+
+	* src/usb-cdc.h (VIRTUAL_COM_PORT_DATA_SIZE)
+	(VIRTUAL_COM_PORT_INT_SIZE): New.
+
+	* src/main.c (#include): Add usb-cdc.h.
+	* src/usb_desc.c (#include): Add usb-cdc.h.
+	* src/usb_endp.c (#include): Add usb_lld.h.
+
+	* src/configure ($help): Add FST_01.
+
+2012-05-10  Niibe Yutaka  <gniibe@fsij.org>
+
+	* STM32_USB-FS-Device_Driver, Virtual_COM_Port: Remove.
+
+	* src/usb_lld.c (#include): Don't include usb_lib.h.
+	(RECIPIENT, REG_BASE PMA_ADDR, CNTR, ISTR, FNR, DADDR, BTABLE)
+	(ISTR_CTR, ISTR_DOVR, ISTR_ERR, ISTR_WKUP, ISTR_SUSP, ISTR_RESET)
+	(ISTR_SOF, ISTR_ESOF, ISTR_DIR, ISTR_EP_ID, CLR_CTR, CLR_DOVR)
+	(CLR_ERR, CLR_WKUP, CLR_SUSP, CLR_RESET, CLR_SOF, CLR_ESOF)
+	(CNTR_CTRM, CNTR_DOVRM, CNTR_ERRM, CNTR_WKUPM, CNTR_SUSPM)
+	(CNTR_RESETM, CNTR_SOFM, CNTR_ESOFM, CNTR_RESUME, CNTR_FSUSP)
+	(CNTR_LPMODE, CNTR_PDWN, CNTR_FRES, DADDR_EF, DADDR_ADD)
+	(EP_CTR_RX, EP_DTOG_RX, EPRX_STAT, EP_SETUP, EP_T_FIELD, EP_KIND)
+	(EP_CTR_TX, EP_DTOG_TX, EPTX_STAT, EPADDR_FIELD, EPREG_MASK)
+	(EP_TX_DIS, EP_TX_STALL, EP_TX_NAK, EP_TX_VALID, EPTX_DTOG1)
+	(EPTX_DTOG2, EP_RX_DIS, EP_RX_STALL, EP_RX_NAK, EP_RX_VALID)
+	(EPRX_DTOG1, EPRX_DTOG2): New. Compatible to ST's USB-FS-Device_Lib.
+	(CH_IRQ_HANDLER): Call usb_interrupt_handler (was: USB_Istr).
+	(EP1_IN_Callback, EP2_IN_Callback, EP3_IN_Callback)
+	(EP4_IN_Callback, EP5_IN_Callback, EP6_IN_Callback)
+	(EP7_IN_Callback, EP1_OUT_Callback, EP2_OUT_Callback)
+	(EP3_OUT_Callback, EP4_OUT_Callback, EP5_OUT_Callback)
+	(EP6_OUT_Callback, EP7_OUT_Callback): New.  Implement here.
+	Compatible to ST's USB-FS-Device_Lib.
+	(USB_MAX_PACKET_SIZE): New.
+	(GET_STATUS, CLEAR_FEATURE, RESERVED1, SET_FEATURE, RESERVED2)
+	(SET_ADDRESS, GET_DESCRIPTOR, SET_DESCRIPTOR, GET_CONFIGURATION)
+	(SET_CONFIGURATION, GET_INTERFACE, SET_INTERFACE)
+	(SYNCH_FRAME,TOTAL_REQUEST): New for USB control transfer.
+	(enum CONTROL_STATE): New for state machine of control pipe.
+	(enum FEATURE_SELECTOR): New.
+	(struct DATA_INFO, struct CONTROL_INFO, struct DEVICE_INFO): New.
+	(ctrl_p, dev_p, data_p, Control_Info, Device_Info, Data_Info):
+	New.
+	(usb_lld_stall_tx, usb_lld_stall_rx)
+	(usb_lld_tx_data_len, usb_lld_txcpy, usb_lld_tx_enable)
+	(usb_lld_write, usb_lld_rx_enable, usb_lld_rx_data_len)
+	(usb_lld_rxcpy): Move from usb_lld.h and not inline.
+	(usb_lld_reset, usb_lld_setup_endpoint)
+	(usb_lld_set_configuration, usb_lld_current_configuration)
+	(usb_lld_set_feature, usb_lld_set_data_to_send): New.
+	(usb_lld_to_pmabuf, usb_lld_from_pmabuf): Clean up.
+	(usb_lld_init): New implementation.
+	(st103_set_btable, st103_get_istr, st103_set_istr, st103_set_cntr)
+	(st103_set_daddr, st103_set_epreg, st103_get_epreg)
+	(st103_set_tx_addr, st103_get_tx_addr, st103_set_tx_count)
+	(st103_get_tx_count, st103_set_rx_addr, st103_get_rx_addr)
+	(st103_set_rx_buf_size, st103_get_rx_count, st103_ep_clear_ctr_rx)
+	(st103_ep_clear_ctr_tx, st103_ep_set_rxtx_status)
+	(st103_ep_set_rx_status, st103_ep_get_rx_status)
+	(st103_ep_set_tx_status, st103_ep_get_tx_status)
+	(st103_ep_clear_dtog_rx, st103_ep_clear_dtog_tx): New lower-level
+	functions for USB related registers access.
+	(usb_interrupt_handler, usb_handle_transfer)
+	(handle_datastage_out, handle_datastage_in, handle_setup0)
+	(handle_in0, handle_out0)
+	(std_none, std_get_status, std_clear_feature, std_set_feature,
+	std_set_address, std_get_descriptor, std_get_configuration,
+	std_set_configuration, std_get_interface, std_set_interface)
+	(std_request_handler): New USB stack implementation.
+
+	* src/usb_lld.h (usb_lld_stall_tx, usb_lld_stall_rx)
+	(usb_lld_tx_data_len, usb_lld_txcpy, usb_lld_tx_enable)
+	(usb_lld_write, usb_lld_rx_enable, usb_lld_rx_data_len)
+	(usb_lld_rxcpy): Those are not inline functions anymore.
+	(USB_DEVICE_DESCRIPTOR_TYPE, USB_CONFIGURATION_DESCRIPTOR_TYPE)
+	(USB_STRING_DESCRIPTOR_TYPE, USB_INTERFACE_DESCRIPTOR_TYPE)
+	(USB_ENDPOINT_DESCRIPTOR_TYPE, STANDARD_ENDPOINT_DESC_SIZE)
+	(ENDP0, ENDP1, ENDP2, ENDP3, ENDP4, ENDP5, ENDP6, ENDP7)
+	(EP_BULK, EP_CONTROL, EP_ISOCHRONOUS, EP_INTERRUPT)
+	(DEVICE_RECIPIENT, INTERFACE_RECIPIENT, ENDPOINT_RECIPIENT)
+	(ENDPOINT_RECIPIENT, OTHER_RECIPIENT)
+	(DEVICE_DESCRIPTOR, CONFIG_DESCRIPTOR, STRING_DESCRIPTOR)
+	(INTERFACE_DESCRIPTOR, ENDPOINT_DESCRIPTOR)
+	(REQUEST_TYPE, STANDARD_REQUEST, CLASS_REQUEST, VENDOR_REQUEST)
+	(USB_UNSUPPORT, USB_SUCCESS)
+	(USB_EVENT_RESET, USB_EVENT_ADDRESS, USB_EVENT_CONFIG)
+	(USB_EVENT_SUSPEND, USB_EVENT_WAKEUP, USB_EVENT_STALL)
+	(USB_SET_INTERFACE, USB_GET_INTERFACE, USB_QUERY_INTERFACE)
+	(UNCONNECTED, ATTACHED, POWERED, SUSPENDED, ADDRESSED)
+	(CONFIGURED, USB_Cable_Config): New.  Compatible to ST's
+	USB-FS-Device_Lib.
+	(struct Descriptor, struct usb_device_method)
+	(Device_Descriptor, Config_Descriptor, String_Descriptors)
+	(STM32_USB_IRQ_PRIORITY, bDeviceState, Device_Method)
+	(usb_lld_init, usb_lld_reset, usb_lld_setup_endpoint)
+	(usb_lld_set_configuration, usb_lld_current_configuration)
+	(usb_lld_set_feature, usb_lld_set_data_to_send): New API.
+
+	* src/usb_prop.c(#include): Only include usb_lld.h for USB.
+	(SetEPRxCount_allocated_size): Remove.
+	(struct line_coding, line_coding, Virtual_Com_Port_Data_Setup)
+	(Virtual_Com_Port_NoData_Setup): Add from usb-cdc-vport.c.
+	(gnuk_device_init, gnuk_device_reset, gnuk_setup_with_data)
+	(gnuk_setup_with_nodata): Follow the API change of USB stack.
+	(gnuk_setup_endpoints_for_interface, gnuk_get_descriptor)
+	(gnuk_usb_event, gnuk_interface): New.
+	(gnuk_device_SetConfiguration, gnuk_device_SetInterface)
+	(gnuk_device_SetDeviceAddress, gnuk_device_Status_In)
+	(gnuk_device_Status_Out, gnuk_device_GetDeviceDescriptor)
+	(gnuk_device_GetConfigDescriptor, gnuk_device_GetStringDescriptor)
+	(gnuk_device_Get_Interface_Setting, gnuk_clock_frequencies)
+	(gnuk_data_rates, msc_lun_info, Device_Table)
+	(User_Standard_Requests): Remove.
+	(Device_Method): Replace Device_Property.
+
+	* src/usb_msc.c (#include): Only include usb_lld.h for USB.
+
+	* src/usb_endp.c (#include): Only include usb_lld.h for USB.
+	(EP5_OUT_Callback): Follow the API change of USB stack.
+
+	* src/usb_desc.c (#include): Only include usb_lld.h for USB.
+	Add usb_conf.h.
+	(Device_Descriptor, Config_Descriptor): Follow the API change
+	of USB stack.
+	(String_Descriptors): New, rename from String_Descriptor.
+
+	* src/usb_conf.h (EP_NUM, BTABLE_ADDRESS, IMR_MSK): Remove.
+	(NUM_STRING_DESC): Add.
+
+	* src/usb-icc.c (#include): Only include usb_lld.h for USB.
+
+	* src/usb-cdc-vport.c, src/usb_prop.h: Remove.
+
+	* src/stmusb.mk, src/vcomport.mk: Remove.
+
+	* src/main.c (#include): Only include usb_lld.h for USB.
+	(main): Remove call to USB_Init.
+
+	* src/Makefile.in (include): Remove stmusb.mk, vcomport.mk.
+	(VCOMSRC) [ENABLE_VCOMPORT]: Add.
+	(INCDIR): Remove STMUSBINCDIR and VCOMDIR.
+
+	* boards/common/hw_config.c (Enter_LowPowerMode)
+	(Leave_LowPowerMode): Remove.
+
+2012-02-02  Niibe Yutaka  <gniibe@fsij.org>
+
+	* Version 0.17.
+
+	* src/usb_desc.c (gnukStringSerial): Updated.
+	(gnukConfigDescriptor): Short APDU only.
+
+	* tool/gnuk_put_binary.py (cmd_get_response): New.
+	(cmd_select_openpgp, cmd_get_data): Call cmd_get_response.
+
+2012-01-30  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/usb-icc.c (struct ccid): Add chained_cls_ins_p1_p2.
+	(end_cmd_apdu_head, icc_cmd_apdu_data, icc_handle_data): Add checking
+	CMD APDU head for command chaining.
+
+2012-01-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	Short APDU only CCID driver.
+	* STM32_USB-FS-Device_Driver/src/usb_core.c (DataStageOut)
+	(DataStageIn): Use usb_lld_to_pmabuf and usb_lld_from_pmabuf.
+
+	* src/configure (CERTDO_SUPPORT): Comment fix.
+
+	* src/gnuk.h (struct adpu): expected_res_size has type uint16_t.
+	(MAX_CMD_APDU_DATA_SIZE, MAX_RES_APDU_DATA_SIZE): New.
+	(MAX_CMD_APDU_SIZE, MAX_RES_APDU_SIZE, USB_BUF_SIZE): Remove.
+	(icc_state_p): New.
+	(set_res_sw): Rename from set_res_apdu.
+
+	* src/call-rsa.c (rsa_decrypt): Use MAX_RES_APDU_DATA_SIZE.
+
+	* src/openpgp.c (set_res_sw): Rename from set_res_apdu.
+	* src/openpgp.h: Use set_res_sw.
+
+	* src/main.c: Handle icc_state_p.
+
+	* src/openpgp-do.c (historical_bytes): command chaining but short
+	APDU only.
+	(extended_capabilities): Change for short APDU only.
+
+	* src/usb-icc.c (USB_BUF_SIZE): Define here (was in gnuk.h).
+	(struct ep_in, epi_init, struct ep_out, epo_init, endpoint_out)
+	(endpoint_in, icc_state_p, struct ccid, APDU_STATE_WAIT_COMMAND)
+	(APDU_STATE_COMMAND_CHAINING, APDU_STATE_COMMAND_RECEIVED)
+	(APDU_STATE_RESULT, APDU_STATE_RESULT_GET_RESPONSE, ccid_reset)
+	(ccid_init, CMD_APDU_HEAD_SIZE, apdu_init, notify_tx, no_buf)
+	(set_sw1sw2, get_sw1sw2, notify_icc, end_icc_rx, end_abdata)
+	(end_cmd_apdu_head, end_nomore_data, end_cmd_apdu_data)
+	(nomore_data, INS_GET_RESPONSE, icc_cmd_apdu_data, icc_abdata)
+	(icc_send_data_block_0x9000, icc_send_data_block_gr, ccid): New.
+	(icc_data_size, icc_seq, icc_next_p, icc_chain_p, icc_tx_size)
+	(icc_thread, icc_state, gpg_thread, ICC_RESPONSE_MSG_DATA_SIZE):
+	Remove.
+	(EP1_IN_Callback): Rewrite using epi.
+	(EP2_OUT_Callback): Rewrite using epo.
+	(icc_prepare_receive): Rewrite using epo and struct ccid.
+	(ATR): Change ofr short APDU only.
+	(icc_error, icc_power_on, icc_send_status, icc_power_off)
+	(icc_send_data_block, icc_send_params, icc_handle_data)
+	(icc_handle_timeout, USBthread): Rewrite using struct ccid.
+
+	* src/usb_desc.c (gnukConfigDescriptor): dwFeatures: Short APDU
+	level, dwMaxCCIDMessageLength: 271.
+
+	* src/usb_lld.c (usb_lld_to_pmabuf, usb_lld_from_pmabuf): New.
+	* src/usb_lld.h (usb_lld_txcpy, void usb_lld_write) Use
+	usb_lld_to_pmabuf.
+	(usb_lld_rxcpy): Use usb_lld_from_pmabuf.
+
+	* src/stmusb.mk (usb_mem.c): Remove.
+
+	* gnuk_put_binary.py (cmd_select_openpgp): No response APDU data.
+	(cmd_verify, cmd_write_binary): Send short APDU.
+	(__main__): Remove RANDOM_NUMBER_BITS support.
+
+	Bug fix for CERTDO_SUPPORT.
+	* src/gnuk.ld.in: Add missing alignment for _data_pool (when no
+	CERTDO_SUPPORT).
+
 2012-01-19  Niibe Yutaka  <gniibe@fsij.org>
 
 	* src/usb-icc.c (icc_handle_data): Handle the case when it only

GNUK_USB_DEVICE_ID

@@ -0,0 +1,3 @@
+# VID:PID	bcdDev	Product_STRING	Vender_STRING
+234b:0000	0200	FSIJ USB Token	Free Software Initiative of Japan
+##########<TAB>	##<TAB>	##########<TAB>	#################

NEWS

@@ -1,15 +1,126 @@
 Gnuk NEWS - User visible changes
 
+* Major changes in Gnuk 1.0
+
+  Released 2012-07-21, by NIIBE Yutaka
+
+This is bug fixes only release.
+
+
+* Major changes in Gnuk 0.21
+
+  Released 2012-07-06, by NIIBE Yutaka
+
+** Test suite
+A functinality test suite is added under test/ directory.
+
+** New tool: stlinkv2.py
+This tool is SWD flash ROM writer with ST-Link/V2.
+
+** New tool: usb_strings.py
+This tool is to dump USB strings, which include revision detail and config
+options.
+
+** Protection improvement (even when internal data is disclosed)
+Even if PW1 and PW3 is same, content of encrypted DEK is different
+now.
+
+
+* Major changes in Gnuk 0.20
+
+  Released 2012-06-19, by NIIBE Yutaka
+
+** Key generation feature added
+Finally, key generation is supported.  Note that it may be very slow.
+It may take a few minutes (or more) to generate two or three keys,
+when you are unlucky.
+
+** DnD pinentry support is deprecated
+Once, DnD pinentry was considered a great feature, but it found that
+it is difficult to remember moves of folders.
+
+** gnuk_upgrade.py assumes using another token for authentication
+Use of another token for authentication is assumed now.  This is
+incompatible change.  Note that when you upgrade a token of version
+0.19 to 0.20 (or later), you need gnuk_upgrade.py of version 0.19.
+
+** KDF (Key Derivation Function) is now SHA-256
+Keystring is now computed by SHA-256 (it was SHA1 before).
+
+** Protection improvements (even when internal data is disclosed)
+Three improvements.  (1) Even if PW1 and Reset-code is same, content
+of encrypted DEK is different now.  (2) DEK is now encrypted and
+decrypted by keystring in ECB mode (it was just a kind of xor by
+single block CFB mode).  (3) Key data plus checksum are encrypted in
+CFB mode with initial vector (it will be able to switch OCB mode
+easily).
+
+** LED display output change
+LED display output by Gnuk is now more reactive.  It shows status code
+when it gets GET_STATUS message of CCID.  When you communicate Gnuk by
+internal CCID driver of GnuPG (instead of PC/SC), and enable
+'debug-disable-ticker' option in .gnupg/scdaemon.conf, it is more
+silent now.
+
+
+* Major changes in Gnuk 0.19
+
+  Released 2012-06-06, by NIIBE Yutaka
+
+** Firmware upgrade feature
+Firmware upgrade is now possible after the public key authentication
+using EXTERNAL AUTHENTICATE command of ISO 7816.  Firmware upgrade is
+done together with reGNUal, the firmware upgrade program.
+
+** System service blocks at the beginning of flash ROM.
+Once flash ROM is protected, first 4-KiB cannot be modified.  Gnuk
+use this area for "system service".  Note that this area will not
+be able to be modified by firmware upgrade (or by any method).
+
+** New tool: gnuk_upgrade.py
+The tool gnuk_upgrade.py is to do public key authentication using
+gpg-agent and send reGNUal to Gnuk.  Then, we put new Gnuk binary
+into the device with reGNUal.
+
+** USB strings for revision detail, configure options, and system service.
+USB strings now have more information.  There are revision detail
+string, configure options string, system service version string, as
+well as vendor string and product string.  These strings could be
+examined to check Gnuk Token.
+
+
+* Major changes in Gnuk 0.18
+
+  Released 2012-05-15, by NIIBE Yutaka
+
+** New mandatory option '--vidpid' for configure
+You must specify USB vendor ID and product ID for Gnuk.
+The file GNUK_USB_DEVICE_ID lists valid USB device IDs.
+
+** New tool: gnuk_remove_keys.py
+The tool gnuk_remove_keys.py is to remove all keys in Gnuk Token
+and reset PW1 and RC (if any).
+
+** New USB stack
+Gnuk used to use USB stack of USB-FS-Device_Lib by ST.  Now, it has
+original implementation.  Hopefully, size and quality are improved.
+
+
 * Major changes in Gnuk 0.17
 
-  Released 2012-01-XX, by NIIBE Yutaka
+  Released 2012-02-02, by NIIBE Yutaka
 
-** ISO 7816 SELECT command behavior is strict now
+** USB CCID/ICCD protocol implementation change
+Gnuk now only supports short APDU level exchange, not supporting
+extended APDU level exchange.  Thus, Gnuk could be compatible to older
+host side software implementation.
+
+** ISO 7816 SELECT command behavior is somewhat strict now
 Old implementations do not check DF name for SELECT command.
 This causes some trouble when Gnuk Token is identified as if it were
 different card/token.  Now, DF name of OpenPGP card is checked.
 
-** USB CCID/ICCD low level bug is fixed
+** USB CCID/ICCD low-level bug is fixed
 When the size of command APDU data is just 49, the lower level packet
 size is 64.  This is maximum size of BULK-OUT transfer packet, and
 caused trouble in the past implementations.  Example is setting url

README

@@ -1,26 +1,26 @@
-Gnuk - software for GnuPG USB Token
+Gnuk - An Implementation of USB Cryptographic Token for GnuPG
 
-							   Version 0.16
-							     2011-12-14
-						           Niibe Yutaka
+							    Version 1.0
+							     2012-07-21
+							   Niibe Yutaka
 				      Free Software Initiative of Japan
 
 What's Gnuk?
 ============
 
-Gnuk is software implementation of a USB token for GNU Privacy Guard.
-Gnuk supports OpenPGP card protocol version 2, and it runs on
+Gnuk is an implementation of USB cryptographic token for GNU Privacy
+Guard.  Gnuk supports OpenPGP card protocol version 2, and it runs on
 STM32F103 processor.
 
 I wish that Gnuk will be a developer's soother who uses GnuPG.  I have
 been nervous of storing secret key(s) on usual secondary storage.
-While I want to work at different places, but it is not the choice for
-me to bring a card reader all the time.  With Gnuk, this issue will be
+There is a solution with OpenPGP card, but it is not the choice for me
+to bring a card reader all the time.  With Gnuk, this issue will be
 solved by a USB token which is small enough.
 
 Please look at the graphics of "gnuk.svg" for the software name.  My
-son used to be with his NUK(R), always, everywhere.  I am with a USB
-Token by "Gnuk", always, everywhere.
+son used to be with his NUK(R), always, everywhere.  Now, I am with a
+USB Cryptographic Token by "Gnuk", always, everywhere.
 
 
 FAQ
@@ -30,18 +30,15 @@ Q0: How Gnuk USB Token is superior than other solutions (OpenPGP
     card 2.0, GPF Crypto Stick, etc.) ?
     http://www.g10code.de/p-card.html
     http://www.privacyfoundation.de/crypto_stick/
-A0: IMRHO, not quite.  There is no ready-to-use out-of-box product.
-    (It is welcome for me that some vendor will manufacture Gnuk USB
-     Token.  Even I can help design of hardware, if needed.)
-    Good points are:
+A0: Good points of Gnuk are:
     * If you have skill of electronics and like DIY, you can build
       Gnuk Token cheaper (see Q8-A8).
     * You can study Gnuk to modify and to enhance.  For example, you
       can implement your own authentication method with some sensor
       such as acceleration sensor.
     * It is "of Free Software"; Gnuk is distributed under GPLv3+,
-            "by Free Software"; Gnuk development requires only Free Software
-	    	                (GNU Toolchain, Python, etc.), 
+	    "by Free Software"; Gnuk development requires only Free Software
+				(GNU Toolchain, Python, etc.), 
 	    "for Free Software"; Gnuk supports GnuPG.
 
 Q1: What kind of key algorithm is supported?
@@ -59,7 +56,7 @@ A3: Orthodox choice is Olimex STM32-H103.
 
 Q4: What's version of GnuPG are you using?
 A4: In Debian GNU/Linux system, I use gnupg 1.4.11-3 and gnupg-agent
-    2.0.14-2 (in sid).  With older versions, you can only sign with SHA1.
+    2.0.18-2.  With older versions, you can only sign with SHA1.
     See: http://www.fsij.org/gnuk/gnupg2-fixes-needed
 
 Q5: What's version of pcscd and libccid are you using?
@@ -82,15 +79,20 @@ A8: STM8S Discovery Kit costs 750 JPY (< $10 USD) only.  You can build
     http://www.fsij.org/gnuk/jtag_dongle_ftdi2232
 
 Q9: I got an error like "gpg: selecting openpgp failed: ec=6.108", what's up?
-A9: GnuPG's SCDaemon has problems for handling insertion/removal of
-    card/reader (problems are fixed in trunk).  When your newly
-    inserted token is not found by GnuPG, try killing scdaemon and let
-    it to be invoked again.  I do:
-      $ killall -9 scdaemon
-    and confirm scdaemon doesn't exist, then,
-      $ gpg-connect-agent learn /bye
 
-Qa: With GNOME, I can't use Gnuk Token for SSH.  How can we use it for SSH?
+A9: GnuPG's SCDaemon has problems for handling insertion/removal of
+    card/reader (problems are fixed in trunk, and backported to 2.0
+    branch, it will be 2.0.20).  When your newly inserted token is not
+    found by GnuPG, try killing scdaemon and let it to be invoked
+    again.  I do:
+
+	 $ gpg-connect-agent "SCD KILLSCD" "SCD BYE" /bye
+
+    and confirm scdaemon doesn't exist, then,
+
+	 $ gpg-connect-agent learn /bye
+
+Qa: With GNOME 2, I can't use Gnuk Token for SSH.  How can we use it for SSH?
 Aa: You need to deactivate seahorse-agent and gnome-keyring, but use
     gpg-agant for the role of ssh-agent.  For gnome-keyring please do:
 
@@ -104,13 +106,18 @@ Ab: That's because gnome-keyring-daemon interferes GnuPG.  Type:
     and at the tab of "Startup Programs", disable check buttons for
     "GPG Password Agent" and "SSH Key Agent".
 
+Qc: Do you know a good SWD debugger to connect FST-01 or something?
+Ac: STLink v2 is cheap one.  We have a tool/stlinkv2.py as flash ROM
+writer program.
 
 
 Release notes
 =============
 
-This is seventeenth release of Gnuk.  While it works well for specific
-usages and it is considered stable, it is still somewhat experimental.
+This is version 1.0 release of Gnuk, after a year and eleven months
+development.  While it is daily use for a year or so, some newly
+introduced features (including key generation and firmware upgrade)
+should be considered experimental.
 
 Tested features are:
 
@@ -127,23 +134,29 @@ Tested features are:
 	* Changing value of password status bytes (0x00C4): forcesig
 	* Verify with pin pad
 	* Modify with pin pad
+	* Card holder certificate (read)
+	* Removal of keys
+	  (Overriding key import is not supported,
+	  but you can remove all keys to import again).
+	* Key generation on device side
+
+Original features of Gnuk, tested lightly:
+
+	* OpenPGP card serial number setup
+	* Card holder certificate (write by UPDATE BINARY)
+	* Upgrading with "EXTERNAL AUTHENTICATE" by reGNUal
 
 It is known not-working well:
 
 	* For some version of kernel and libccid, --enable-debug can't
-          work well.  Please disable DEBUG option if it doesn't work well.
+	  work well.  Please make sure to disable DEBUG option if it
+	  doesn't work well.
 
-	* Card holder certificate
-	  It is implemented in Gnuk side.  But its large size matters
-	  (> 1KB).  Some versions of GnuPG cannot handle a data object
-	  of large size with PC/SC backend.  Specifically,
-	  handle_transmit function in pcsc-wrapper.c uses the buffer
-	  of size 1024-byte.
-
-Not supported feature(s):
-
-	* Overriding key import.  You need to remove all keys first.
-	* Key generation on device side
+It is known that the combination of libccid 1.4.1 (or newer) with
+libusb 1.0.8 (or older) has a minor problem.  It is rare but it is
+possible for USB communication to be failed, because of a bug in
+libusb implementation.  Use libusbx 1.0.9 or newer, or don't use
+PC/SC, but use internal CCID driver of GnuPG.
 
 
 Targets
@@ -156,7 +169,7 @@ With DfuSe support, CQ STARM, STBee, and STBee Mini are also our
 targets.  But those targets with DfuSe are basically not for normal
 use but for experiments, because it would be impossible for DfuSe to
 disable read from flash.  For real use, please consider killing DfuSe
-and enable read protection using JTAG debugger.
+and enabling read protection using JTAG debugger.
 
 I think that it could run on Olimex STM32-P103, or other boards with
 STM32F103.  Besides, we are porting it to STM32 Primer 2.
@@ -173,15 +186,10 @@ Another PIN-pad support is connecting rotary encoder, push switch and
 7-segment LED display.  Both of PIN verification and PIN modification
 are supported for this circuit extension.
 
-Recently, "DnDpinentry" support is added.  This is using usual file
-manager for pinentry.  User does "drag and drop" folders and it will
-be pin entry.  This feature doesn't require any additional hardware.
-See doc/settings-for-DnDpinentry for your desktop configuration.
-
-Note that you need pinpad support for GnuPG, it's currently in the
-master branch of GnuPG git repository at git.gnupg.org, and it's under
-evaluation.  When it will be considered stable, it will be put onto
-stable branch.
+Note that you need pinpad support for GnuPG to use PIN-pad enabled
+Gnuk.  The pinpad support for GnuPG is currently in the master branch
+of GnuPG git repository at git.gnupg.org, and it's under evaluation.
+When it will be considered stable, it will be put onto stable branch.
 
 
 Souce code
@@ -189,6 +197,11 @@ Souce code
 
 Gnuk source code is under src/ directory.
 
+Note that SHA-2 hash function implementation, src/sha256.c, is based
+on the original implementation by Dr. Brian Gladman.  See:
+
+  http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/index.php
+
 
 License
 =======
@@ -197,12 +210,12 @@ It is distributed under GNU General Public Licence version 3 or later
 (GPLv3+).  Please see src/COPYING.
 
 Please note that it is distributed with external source code too.
-Please read relevant licenses for external source code, too.
+Please read relevant licenses for external source code as well.
 
 The author(s) of Gnuk expect users of Gnuk will be able to access the
 source code of Gnuk, so that users can study the code and can modify
 if needed.  This doesn't mean person who has a USB Token by Gnuk
-should be able to acess everything on the Token, regardless of its
+should be able to access everything on the Token, regardless of its
 protections.  Private keys, and other information should be protected
 properly.
 
@@ -221,28 +234,74 @@ Gnuk is distributed with external source code.
 * polarssl-0.14.0/  -- PolarSSL 0.14.0
 
   Taken from http://polarssl.org/
-  We use PolarSSL for RSA computation, AES encryption/decryption
-  and SHA-1 computation.
+  We use PolarSSL for RSA computation, AES encryption/decryption.
 
   The file include/polarssl/bn_mul.h is heavily modified for ARM
   Cortex-M3.
 
-* STM32_USB-FS-Device_Driver/ -- a part of USB-FS-Device_Lib
-* Virtual_COM_Port/ -- a part of USB-FS-Device_Lib
+  The files include/polarssl/rsa.h, library/rsa.c,
+  include/polarssl/bignum.h, and library/bignum.c are modified so that
+  f_rng function returns unsigned char.
 
-  STM32F10x USB Full Speed Device Library (USB-FS-Device_Lib)
-  is a STM32F10x library for USB functionality.
+  The file library/rsa.c is modified so that it only computes things
+  needed for Gnuk.
 
-  I took Libraries/STM32_USB-FS-Device_Driver and 
-  Project/Virtual_COM_Port in STM32_USB-FS-Device_Lib distribution.
-  See http://www.st.com/ for detail.
+  The file library/aes.c is modified so that some constants can
+  go to .sys section.
+
+
+USB vendor ID and product ID (USB device ID)
+============================================
+
+When you have a vender ID and assign a product ID for Gnuk, edit the
+file GNUK_USB_DEVICE_ID and add an entry for yours.  In this case,
+please contact Niibe, so that it is listed to the file in the official
+release of the source code.
+
+When you are modifing Gnuk and installing the binary to device, you
+should replace "FSIJ" in the string gnukStringSerial (usb_desc.c) to
+yours, so that the device will say it's modified version by device
+serial number.
+
+FSIJ allows you to use USB device ID of FSIJ (234b:0000) for devices
+with Gnuk under one of following conditions:
+
+  * For everyone for experimental purpose:
+
+    - You must not distribute a binary with FSIJ's USB device ID, but
+      must use the binary by yourself only for your experiment.  Note
+      that "Distributing binary" includes distributing a device which
+      holds the binary.
+
+  * For general individuals:
+
+    - You must use your Gnuk device with a card serial number which is
+      *not* by FSIJ.  Easy one would be a card serial number generated
+      by chip unique ID.
+
+  * For individuals with explicit permission from FSIJ.
+
+    - You should have an assigned card serial number by FSIJ,
+      please use that number for your device.
+      (There a file 'GNUK_SERIAL_NUMBER' in the official release.)
+
+FSIJ could give companies or business entities "second source
+manufacturer" license to use USB device ID of FSIJ for devices with
+unmodified version of Gnuk, provided they support Free Software and
+respect users' freedom for computing.  Please ask FSIJ for the
+license.
+
+Otherwise, companies which want to distribute Gnuk devices, please use
+your own USB vendor ID and product ID.  Please replace "FSIJ" in the
+string gnukStringSerial (usb_desc.c) to yours, when you modify Gnuk.
 
 
 Host Requirements
 =================
 
-For GNU/Linux, libccid version >= 1.3.11 is required.
-libccid version == 1.3.9 is known not working well by the issue [r4235].
+For GNU/Linux, PC/SC service is an option, you can use GnuPG's
+internal CCID driver instead.  If you chose using PC/SC service,
+libccid version >= 1.3.11 is recommended for GNU/Linux.
 
 I think that it should not be requirment but the kernel version of my use is:
 Linux version 2.6.32-5-686 (Debian 2.6.32-18) (ben@decadent.org.uk) (gcc version 4.3.5 (Debian 4.3.5-2) ) #1 SMP Sat Jul 24 02:27:10 UTC 2010
@@ -258,7 +317,7 @@ You need GNU toolchain and newlib for 'arm-none-eabi' target.
 
 See http://github.com/esden/summon-arm-toolchain/ (which includes fix
 of binutils-2.21.1) for preparation of GNU Toolchain for
-'arm-none-eabi' target.
+'arm-none-eabi' target.  This is for GCC 4.5.
 
 # Note that we need to link correct C library (for string functions).
 # For this purpose, Makefile.in contains following line:
@@ -274,6 +333,13 @@ of binutils-2.21.1) for preparation of GNU Toolchain for
 # -mno-thumb-interwork option.  This means that you should not
 # link C library which contains ARM (not Thumb) code.
 
+Recently, there is "gcc-arm-embedded" project.  See:
+
+    https://launchpad.net/gcc-arm-embedded/
+
+It is based on GCC 4.6.   For version 4.6-2012-q2-update, you'd
+need "-O3 -Os" instead of "-O2" and it will be slightly better.
+
 
 Change directory to `src':
 
@@ -281,7 +347,11 @@ Change directory to `src':
 
 Then, run `configure':
 
-  $ ./configure
+  $ ./configure --vidpid=<VID:PID>
+
+Here, you need to specify USB vendor ID and product ID.  For FSIJ's,
+it's: --vidpid=234b:0000 .  Please read section 'USB vendor ID and
+product ID' above.
 
 Type:
 
@@ -417,7 +487,7 @@ PyUSB (python-usb package in Debian).
 If scdaemon is running, please kill it, or you will get "Smartcard
 Exception" by "Sharing violation".
 
-  $ killall -9 scdaemon
+  $ gpg-connect-agent "SCD KILLSCD" "SCD BYE" /bye
 
 In case of PyUSB tool, you need to stop pcscd.
 
@@ -496,11 +566,15 @@ This entry has been added into libccid 1.4.1 already ([r5425]).
 Testing Gnuk
 ------------
 
-Try following to see Gnuk runs:
+Type following command to see Gnuk runs:
 
   $ gpg --card-status
 
 
+Besides, there is a functinality test under test/ directory.  See
+test/README.
+
+
 Personalize the Token and import keys
 -------------------------------------
 
@@ -513,18 +587,21 @@ command is:
 Note that the factory setting of user password is "123456" and admin
 password is "12345678" as the specification.
 
-No, Gnuk doesn't support key generation.  You need to create your
-keys on your computer, and import them to Gnuk Token.  After you create
-your keys (they must be 2048-bit RSA), you can import them.
+It is recommended to create your keys on your computer, and import
+them to Gnuk Token.  After you create your keys (they must be 2048-bit
+RSA), you can import them.
 
-For detail, please see doc/DEMO and doc/DEMO-2.
+Gnuk supports key generation, but this feature is young and should be
+considered experimental.
+
+For detail, please see doc/note/DEMO and doc/note/DEMO-2.
 
 Note that it make sense to preserve your keys on your computer so that
 you can import the keys (again) to (possibly another) Gnuk Token.  In
 this case, you can use GnuPG's option to specify the home directory by
 --homedir.
 
-After creating keys by:
+After creating keys on your computer by:
 
   $ gpg --gen-key
   ...
@@ -576,6 +653,12 @@ You can observe the traffic of USB using "usbmon".  See the file:
 linux/Documentation/usb/usbmon.txt
 
 
+Firmware update
+===============
+
+See doc/note/firmware-update.
+
+
 Read-only Git Repository
 ========================
 

STM32_USB-FS-Device_Driver/inc/otgd_fs_cal.h

@@ -1,258 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : otgd_fs_cal.h
-* Author             : STMicroelectronics
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Header of OTG FS Device Core Access Layer interface.
-********************************************************************************
-* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-#ifndef __OTG_CORE_H__
-#define __OTG_CORE_H__
-
-#ifdef STM32F10X_CL
-
-#include "stm32f10x.h"
-#include "usb_type.h"
-
-#if defined ( __CC_ARM   )
-  #define __packed        __packed                     /*!< packing keyword for ARM Compiler */
-#elif defined ( __ICCARM__ )
-  #define __packed        __packed                     /*!< packing keyword for IAR Compiler */
-#elif defined   (  __GNUC__  )
-  #define __packed        __attribute__ ((__packed__)) /*!< packing keyword for GNU Compiler */
-#elif defined   (  __TASKING__  )                      /*!< packing keyword for TASKING Compiler */
-  #define __packed   
-#endif /* __CC_ARM */
-
-/*******************************************************************************
-                                define and types
-*******************************************************************************/
-
-#define DEVICE_MODE_ENABLED
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
-
-#define DEV_EP_TX_DIS       0x0000
-#define DEV_EP_TX_STALL     0x0010
-#define DEV_EP_TX_NAK       0x0020
-#define DEV_EP_TX_VALID     0x0030
- 
-#define DEV_EP_RX_DIS       0x0000
-#define DEV_EP_RX_STALL     0x1000
-#define DEV_EP_RX_NAK       0x2000
-#define DEV_EP_RX_VALID     0x3000
-
-/*****************          GLOBAL DEFINES          ***************************/
-
-#define GAHBCFG_TXFEMPTYLVL_EMPTY              1
-#define GAHBCFG_TXFEMPTYLVL_HALFEMPTY          0
-
-#define GAHBCFG_GLBINT_ENABLE                  1
-#define GAHBCFG_INT_DMA_BURST_SINGLE           0
-#define GAHBCFG_INT_DMA_BURST_INCR             1
-#define GAHBCFG_INT_DMA_BURST_INCR4            3
-#define GAHBCFG_INT_DMA_BURST_INCR8            5
-#define GAHBCFG_INT_DMA_BURST_INCR16           7
-#define GAHBCFG_DMAENABLE                      1
-#define GAHBCFG_TXFEMPTYLVL_EMPTY              1
-#define GAHBCFG_TXFEMPTYLVL_HALFEMPTY          0
-
-#define GRXSTS_PKTSTS_IN                       2
-#define GRXSTS_PKTSTS_IN_XFER_COMP             3
-#define GRXSTS_PKTSTS_DATA_TOGGLE_ERR          5
-#define GRXSTS_PKTSTS_CH_HALTED                7
-
-#define DEVICE_MODE                            0
-#define HOST_MODE                              1
-
-/*****************           DEVICE DEFINES         ***************************/
-
-#define DSTS_ENUMSPD_HS_PHY_30MHZ_OR_60MHZ     0
-#define DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ     1
-#define DSTS_ENUMSPD_LS_PHY_6MHZ               2
-#define DSTS_ENUMSPD_FS_PHY_48MHZ              3
-
-#define DCFG_FRAME_INTERVAL_80                 0
-#define DCFG_FRAME_INTERVAL_85                 1
-#define DCFG_FRAME_INTERVAL_90                 2
-#define DCFG_FRAME_INTERVAL_95                 3
-
-#define DEP0CTL_MPS_64                         0
-#define DEP0CTL_MPS_32                         1
-#define DEP0CTL_MPS_16                         2
-#define DEP0CTL_MPS_8                          3
-
-#define EP_SPEED_LOW                           0
-#define EP_SPEED_FULL                          1
-#define EP_SPEED_HIGH                          2
-
-#define EP_TYPE_CTRL                           0
-#define EP_TYPE_ISOC                           1
-#define EP_TYPE_BULK                           2
-#define EP_TYPE_INTR                           3
-
-#define STS_GOUT_NAK                           1
-#define STS_DATA_UPDT                          2
-#define STS_XFER_COMP                          3
-#define STS_SETUP_COMP                         4
-#define STS_SETUP_UPDT                         6
-
-
-
-
-typedef enum {
-
-  USB_OTG_OK,
-  USB_OTG_FAIL
-
-}USB_OTG_Status;
-
-typedef struct USB_OTG_hc
-{
-  uint8_t       hc_num;
-  uint8_t       dev_addr ;
-  uint8_t        ep_num;
-  uint8_t       ep_is_in;
-  uint8_t       speed;
-  uint8_t       ep_type;
-  uint16_t       max_packet;
-  uint8_t       data_pid;
-  uint16_t       multi_count;
-  uint8_t        *xfer_buff;
-  uint32_t       xfer_len;
-}
-USB_OTG_HC , *PUSB_OTG_HC;
-
-typedef struct USB_OTG_ep
-{
-  uint8_t        num;
-  uint8_t        is_in;
-  uint32_t       tx_fifo_num;
-  uint32_t       type;
-  uint8_t        data_pid_start;
-  uint8_t        even_odd_frame;
-  uint32_t       maxpacket;
-  uint8_t        *xfer_buff;
-  uint32_t       xfer_len;
-  uint32_t       xfer_count;
-}
-
-USB_OTG_EP , *PUSB_OTG_EP;
-
-/********************************************************************************
-                                      MACRO'S
-********************************************************************************/
-
-#define CLEAR_IN_EP_INTR(epnum,intr) \
-  diepint.d32=0; \
-  diepint.b.intr = 1; \
-  WRITE_REG32(&core_regs.inep_regs[epnum]->dev_in_ep_int,diepint.d32);
-
-#define CLEAR_OUT_EP_INTR(epnum,intr) \
-  doepint.d32=0; \
-  doepint.b.intr = 1; \
-  WRITE_REG32(&core_regs.outep_regs[epnum]->dev_out_ep_int,doepint.d32);
-
-
-#define READ_REG32(reg)  (*(__IO uint32_t *)reg)
-
-#define WRITE_REG32(reg,value) (*(__IO uint32_t *)reg = value)
-
-#define MODIFY_REG32(reg,clear_mask,set_mask) \
-  WRITE_REG32(reg, (((READ_REG32(reg)) & ~clear_mask) | set_mask ) )
-
-
-#define uDELAY(usec)  udelay(usec)
-#define mDELAY(msec)  uDELAY(msec * 1000)
-
-#define _OTGD_FS_GATE_PHYCLK     *(__IO uint32_t*)(0x50000E00) = 0x03
-#define _OTGD_FS_UNGATE_PHYCLK   *(__IO uint32_t*)(0x50000E00) = 0x00
-
-/*******************************************************************************
-                   this can be changed for real time base
-*******************************************************************************/
-static void udelay (const uint32_t usec)
-{
-  uint32_t count = 0;
-  const uint32_t utime = usec * 10;
-  do
-  {
-    if ( ++count > utime )
-    {
-      return ;
-    }
-  }
-  while (1);
-}
-/********************************************************************************
-                     EXPORTED FUNCTIONS FROM THE OTGD_FS_CAL LAYER
-********************************************************************************/
-USB_OTG_Status  OTGD_FS_CoreInit(void);
-USB_OTG_Status  OTGD_FS_SetAddress(uint32_t BaseAddress);
-USB_OTG_Status  OTGD_FS_EnableGlobalInt(void);
-USB_OTG_Status  OTGD_FS_DisableGlobalInt(void);
-
-USB_OTG_Status  USB_OTG_CoreInitHost(void);
-USB_OTG_Status  USB_OTG_EnableHostInt(void);
-USB_OTG_Status  USB_OTG_DisableHostInt(void);
-
-void*  OTGD_FS_ReadPacket(uint8_t *dest, uint16_t bytes);
-USB_OTG_Status OTGD_FS_WritePacket(uint8_t *src, uint8_t ch_ep_num, uint16_t bytes);
-
-USB_OTG_Status  USB_OTG_HcInit(USB_OTG_HC *hc);
-USB_OTG_Status  USB_OTG_StartXfer(USB_OTG_HC *hc);
-
-uint32_t USB_OTG_ResetPort( void);
-
-uint32_t USB_OTG_ReadHPRT0(void);
-uint32_t OTGD_FS_ReadDevAllInEPItr(void);
-uint32_t OTGD_FS_ReadCoreItr(void);
-uint32_t OTGD_FS_ReadOtgItr (void);
-uint32_t USB_OTG_ReadHostAllChannels_intr (void);
-uint8_t IsHostMode(void);
-uint8_t IsDeviceMode(void);
-USB_OTG_Status USB_OTG_HcInit(USB_OTG_HC *hc);
-USB_OTG_Status USB_OTG_HcHalt(uint8_t hc_num);
-
-USB_OTG_Status  OTGD_FS_FlushTxFifo (uint32_t num);
-USB_OTG_Status  OTGD_FS_FlushRxFifo (void);
-USB_OTG_Status  OTGD_FS_SetHostMode (void);
-
-USB_OTG_Status OTGD_FS_PhyInit(void);
-USB_OTG_Status USB_OTG_HcStartXfer(USB_OTG_HC *hc);
-
-USB_OTG_Status OTGD_FS_CoreInitDev (void);
-USB_OTG_Status  OTGD_FS_EnableDevInt(void);
-USB_OTG_Status  OTGD_FS_EP0Activate(void);
-USB_OTG_Status  OTGD_FS_EPActivate(USB_OTG_EP *ep);
-USB_OTG_Status  OTGD_FS_EPDeactivate(USB_OTG_EP *ep);
-
-USB_OTG_Status  OTGD_FS_EPStartXfer(USB_OTG_EP *ep);
-USB_OTG_Status OTGD_FS_EP0StartXfer(USB_OTG_EP *ep);
-
-USB_OTG_Status  OTGD_FS_EPSetStall(USB_OTG_EP *ep);
-USB_OTG_Status  OTGD_FS_EPClearStall(USB_OTG_EP *ep);
-uint32_t OTGD_FS_ReadDevAllOutEp_itr(void);
-uint32_t OTGD_FS_ReadDevOutEP_itr(USB_OTG_EP *ep);
-uint32_t OTGD_FS_ReadDevAllInEPItr(void);
-
-
-uint32_t OTGD_FS_Dev_GetEPStatus(USB_OTG_EP *ep);
-void OTGD_FS_Dev_SetEPStatus(USB_OTG_EP *ep, uint32_t Status);
-void OTGD_FS_Dev_SetRemoteWakeup(void);
-void OTGD_FS_Dev_ResetRemoteWakeup(void);
-
-#endif /* STM32F10X_CL */
-
-#endif
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
-

STM32_USB-FS-Device_Driver/inc/otgd_fs_dev.h

@@ -1,121 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : otg_dev.h
-* Author             : STMicroelectronics
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : linking defines
-********************************************************************************
-* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __OTG_DEV_H__
-#define __OTG_DEV_H__
-
-#ifdef STM32F10X_CL
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x.h"
-#include "usb_type.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-
-/* Endpoint types */
-#define OTG_DEV_EP_TYPE_CONTROL       0
-#define OTG_DEV_EP_TYPE_ISOC          1
-#define OTG_DEV_EP_TYPE_BULK          2
-#define OTG_DEV_EP_TYPE_INT           3
-
-/* Endpoint Addresses (w/direction) */
-#define EP0_OUT                    0x00  
-#define EP0_IN                     0x80  
-#define EP1_OUT                    0x01  
-#define EP1_IN                     0x81  
-#define EP2_OUT                    0x02  
-#define EP2_IN                     0x82  
-#define EP3_OUT                    0x03  
-#define EP3_IN                     0x83  
-
-
-/*-*-*-*-*-*-*-*-*-* Replace the usb_regs.h defines -*-*-*-*-*-*-*-*-*-*-*-*-*/
-/* endpoints enumeration */
-#define ENDP0   ((uint8_t)0)
-#define ENDP1   ((uint8_t)1)
-#define ENDP2   ((uint8_t)2)
-#define ENDP3   ((uint8_t)3)
-#define ENDP4   ((uint8_t)4)
-#define ENDP5   ((uint8_t)5)
-#define ENDP6   ((uint8_t)6)
-#define ENDP7   ((uint8_t)7)
-
-/* EP Transmit status defines */
-#define EP_TX_DIS              DEV_EP_TX_DIS)  /* EndPoint TX DISabled */
-#define EP_TX_STALL            DEV_EP_TX_STALL /* EndPoint TX STALLed */
-#define EP_TX_NAK              DEV_EP_TX_NAK   /* EndPoint TX NAKed */
-#define EP_TX_VALID            DEV_EP_TX_VALID /* EndPoint TX VALID */
-
-/* EP Transmit status defines */
-#define EP_RX_DIS              DEV_EP_RX_DIS   /* EndPoint RX DISabled */
-#define EP_RX_STALL            DEV_EP_RX_STALL /* EndPoint RX STALLed */
-#define EP_RX_NAK              DEV_EP_RX_NAK   /* EndPoint RX NAKed */
-#define EP_RX_VALID            DEV_EP_RX_VALID /* EndPoint RX VALID */
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-
-/* Exported macro ------------------------------------------------------------*/
-#define _GetEPTxStatus(bEpNum)        ((uint16_t)OTG_DEV_GetEPTxStatus(bEpNum))
-#define _GetEPRxStatus(bEpNum)        ((uint16_t)OTG_DEV_GetEPRxStatus(bEpNum))
-
-#define _SetEPTxStatus(bEpNum,wState) (OTG_DEV_SetEPTxStatus(bEpNum, wState))
-#define _SetEPRxStatus(bEpNum,wState) (OTG_DEV_SetEPRxStatus(bEpNum, wState))
-
-#define _SetEPTxValid(bEpNum)         (OTG_DEV_SetEPTxStatus(bEpNum, EP_TX_VALID))
-#define _SetEPRxValid(bEpNum)         (OTG_DEV_SetEPRxStatus(bEpNum, EP_RX_VALID))
-
-#define _GetTxStallStatus(bEpNum)     (OTG_DEV_GetEPTxStatus(bEpNum) == EP_TX_STALL)
-#define _GetRxStallStatus(bEpNum)     (OTG_DEV_GetEPRxStatus(bEpNum) == EP_RX_STALL) 
-
-/* Define the callbacks for updating the USB state machine */
-#define OTGD_FS_DEVICE_RESET              Device_Property.Reset()
-
-/* Exported define -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-void OTG_DEV_Init(void);
-void OTG_DEV_EP_Init(uint8_t bEpAdd, uint8_t bEpType, uint16_t wEpMaxPackSize);
-
-void OTG_DEV_SetEPRxStatus(uint8_t bEpnum, uint32_t status);
-void OTG_DEV_SetEPTxStatus(uint8_t bEpnum, uint32_t status); 
-uint32_t OTG_DEV_GetEPRxStatus(uint8_t bEpnum); 
-uint32_t OTG_DEV_GetEPTxStatus(uint8_t bEpnum); 
-
-void USB_DevDisconnect(void);
-void USB_DevConnect(void);
-
-
-/*-*-*-*-*-*-*-*-*-* Replace the usb_regs.h prototypes *-*-*-*-*-*-*-*-*-*-*-*/
-void SetEPTxStatus(uint8_t bEpNum, uint16_t wState);
-void SetEPRxStatus(uint8_t bEpNum, uint16_t wState);
-uint16_t GetEPTxStatus(uint8_t bEpNum);
-uint16_t GetEPRxStatus(uint8_t bEpNum);
-void SetEPTxValid(uint8_t bEpNum);
-void SetEPRxValid(uint8_t bEpNum);
-uint16_t GetTxStallStatus(uint8_t bEpNum);
-uint16_t GetRxStallStatus(uint8_t bEpNum);
-void SetEPTxCount(uint8_t bEpNum, uint16_t wCount);
-void SetEPRxCount(uint8_t bEpNum, uint16_t wCount);
-
-uint16_t ToWord(uint8_t, uint8_t);
-uint16_t ByteSwap(uint16_t);
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-
-#endif /* STM32F10X_CL */
-
-#endif /* __OTG_DEV_H__ */
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
-

STM32_USB-FS-Device_Driver/inc/otgd_fs_int.h

@@ -1,54 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : otgd_fs_int.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Endpoint interrupt's service routines prototypes.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_INT_H
-#define __USB_INT_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#ifdef STM32F10X_CL
-
-/* Interrupt Handlers functions */
-uint32_t OTGD_FS_Handle_ModeMismatch_ISR(void);
-uint32_t OTGD_FS_Handle_Sof_ISR(void);
-uint32_t OTGD_FS_Handle_RxStatusQueueLevel_ISR(void);
-uint32_t OTGD_FS_Handle_NPTxFE_ISR(void);
-uint32_t OTGD_FS_Handle_GInNakEff_ISR(void);
-uint32_t OTGD_FS_Handle_GOutNakEff_ISR(void);
-uint32_t OTGD_FS_Handle_EarlySuspend_ISR(void);
-uint32_t OTGD_FS_Handle_USBSuspend_ISR(void);
-uint32_t OTGD_FS_Handle_UsbReset_ISR(void);
-uint32_t OTGD_FS_Handle_EnumDone_ISR(void);
-uint32_t OTGD_FS_Handle_IsoOutDrop_ISR(void);
-uint32_t OTGD_FS_Handle_EOPF_ISR(void);
-uint32_t OTGD_FS_Handle_EPMismatch_ISR(void);
-uint32_t OTGD_FS_Handle_InEP_ISR(void);
-uint32_t OTGD_FS_Handle_OutEP_ISR(void);
-uint32_t OTGD_FS_Handle_IncomplIsoIn_ISR(void);
-uint32_t OTGD_FS_Handle_IncomplIsoOut_ISR(void);
-uint32_t OTGD_FS_Handle_Wakeup_ISR(void);
-
-#endif /* STM32F10X_CL */
-
-/* External variables --------------------------------------------------------*/
-
-#endif /* __USB_INT_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/otgd_fs_pcd.h

@@ -1,87 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : otgd_fs_pcd.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Header file of the High Layer device mode interface and 
-*                      wrapping layer
-********************************************************************************
-* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-#ifndef __USB_OTG_PCD_H__
-#define __USB_OTG_PCD_H__
-
-#include "otgd_fs_regs.h"
-
-#define MAX_EP0_SIZE                    0x40
-#define MAX_PACKET_SIZE                 0x400
-
-
-#define USB_ENDPOINT_XFER_CONTROL       0
-#define USB_ENDPOINT_XFER_ISOC          1
-#define USB_ENDPOINT_XFER_BULK          2
-#define USB_ENDPOINT_XFER_INT           3
-#define USB_ENDPOINT_XFERTYPE_MASK      3
-
-
-/********************************************************************************
-                              ENUMERATION TYPE
-********************************************************************************/
-enum usb_device_speed {
-  USB_SPEED_UNKNOWN = 0,
-  USB_SPEED_LOW, USB_SPEED_FULL,
-  USB_SPEED_HIGH
-};
-/********************************************************************************
-                              Data structure type
-********************************************************************************/
-typedef struct usb_ep_descriptor
-{
-  uint8_t  bLength;
-  uint8_t  bDescriptorType;
-  uint8_t  bEndpointAddress;
-  uint8_t  bmAttributes;
-  uint16_t wMaxPacketSize;
-  uint8_t  bInterval;
-}
-EP_DESCRIPTOR , *PEP_DESCRIPTOR;
-/********************************************************************************
-                     USBF LAYER UNION AND STRUCTURES
-********************************************************************************/
-typedef struct USB_OTG_USBF
-{
-
-  USB_OTG_EP ep0;
-  uint8_t     ep0state;
-  USB_OTG_EP in_ep[ MAX_TX_FIFOS - 1];
-  USB_OTG_EP out_ep[ MAX_TX_FIFOS - 1];
-}
-USB_OTG_PCD_DEV , *USB_OTG_PCD_PDEV;
-/********************************************************************************
-                     EXPORTED FUNCTION FROM THE USB_OTG LAYER
-********************************************************************************/
-void  OTGD_FS_PCD_Init(void);
-void  OTGD_FS_PCD_DevConnect (void);
-void  OTGD_FS_PCD_DevDisconnect (void);
-void  OTGD_FS_PCD_EP_SetAddress (uint8_t address);
-uint32_t   OTGD_FS_PCD_EP_Open(EP_DESCRIPTOR *epdesc);
-uint32_t   OTGD_FS_PCD_EP_Close  ( uint8_t  ep_addr);
-uint32_t   OTGD_FS_PCD_EP_Read  ( uint8_t  ep_addr, uint8_t  *pbuf, uint32_t   buf_len);
-uint32_t   OTGD_FS_PCD_EP_Write ( uint8_t  ep_addr, uint8_t  *pbuf, uint32_t   buf_len);
-uint32_t   OTGD_FS_PCD_EP_Stall (uint8_t   epnum);
-uint32_t   OTGD_FS_PCD_EP_ClrStall (uint8_t epnum);
-uint32_t   OTGD_FS_PCD_EP_Flush (uint8_t epnum);
-uint32_t   OTGD_FS_PCD_Handle_ISR(void);
-
-USB_OTG_EP* OTGD_FS_PCD_GetOutEP(uint32_t ep_num) ;
-USB_OTG_EP* OTGD_FS_PCD_GetInEP(uint32_t ep_num);
-void OTGD_FS_PCD_EP0_OutStart(void);
-
-#endif
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_core.h

@@ -1,243 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_core.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Standard protocol processing functions prototypes
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_CORE_H
-#define __USB_CORE_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-typedef enum _CONTROL_STATE
-{
-  WAIT_SETUP,       /* 0 */
-  SETTING_UP,       /* 1 */
-  IN_DATA,          /* 2 */
-  OUT_DATA,         /* 3 */
-  LAST_IN_DATA,     /* 4 */
-  LAST_OUT_DATA,    /* 5 */
-  WAIT_STATUS_IN,   /* 7 */
-  WAIT_STATUS_OUT,  /* 8 */
-  STALLED,          /* 9 */
-  PAUSE             /* 10 */
-} CONTROL_STATE;    /* The state machine states of a control pipe */
-
-typedef struct OneDescriptor
-{
-  uint8_t *Descriptor;
-  uint16_t Descriptor_Size;
-}
-ONE_DESCRIPTOR, *PONE_DESCRIPTOR;
-/* All the request process routines return a value of this type
-   If the return value is not SUCCESS or NOT_READY,
-   the software will STALL the correspond endpoint */
-typedef enum _RESULT
-{
-  USB_SUCCESS = 0,    /* Process sucessfully */
-  USB_ERROR,
-  USB_UNSUPPORT,
-  USB_NOT_READY       /* The process has not been finished, endpoint will be
-                         NAK to further rquest */
-} RESULT;
-
-
-/*-*-*-*-*-*-*-*-*-*-* Definitions for endpoint level -*-*-*-*-*-*-*-*-*-*-*-*/
-typedef struct _ENDPOINT_INFO
-{
-  /* When send data out of the device,
-   CopyData() is used to get data buffer 'Length' bytes data
-   if Length is 0,
-    CopyData() returns the total length of the data
-    if the request is not supported, returns 0
-    (NEW Feature )
-     if CopyData() returns -1, the calling routine should not proceed
-     further and will resume the SETUP process by the class device
-   if Length is not 0,
-    CopyData() returns a pointer to indicate the data location
-   Usb_wLength is the data remain to be sent,
-   Usb_wOffset is the Offset of original data
-  When receive data from the host,
-   CopyData() is used to get user data buffer which is capable
-   of Length bytes data to copy data from the endpoint buffer.
-   if Length is 0,
-    CopyData() returns the available data length,
-   if Length is not 0,
-    CopyData() returns user buffer address
-   Usb_rLength is the data remain to be received,
-   Usb_rPointer is the Offset of data buffer
-  */
-  uint16_t  Usb_wLength;
-  uint16_t  Usb_wOffset;
-  uint16_t  PacketSize;
-  uint8_t   *(*CopyData)(uint16_t Length);
-}ENDPOINT_INFO;
-
-/*-*-*-*-*-*-*-*-*-*-*-* Definitions for device level -*-*-*-*-*-*-*-*-*-*-*-*/
-
-typedef struct _DEVICE
-{
-  uint8_t Total_Endpoint;     /* Number of endpoints that are used */
-  uint8_t Total_Configuration;/* Number of configuration available */
-}
-DEVICE;
-
-typedef union
-{
-  uint16_t w;
-  struct BW
-  {
-    uint8_t bb1;
-    uint8_t bb0;
-  }
-  bw;
-} uint16_t_uint8_t;
-
-typedef struct _DEVICE_INFO
-{
-  uint8_t USBbmRequestType;       /* bmRequestType */
-  uint8_t USBbRequest;            /* bRequest */
-  uint16_t_uint8_t USBwValues;         /* wValue */
-  uint16_t_uint8_t USBwIndexs;         /* wIndex */
-  uint16_t_uint8_t USBwLengths;        /* wLength */
-
-  uint8_t ControlState;           /* of type CONTROL_STATE */
-  uint8_t Current_Feature;
-  uint8_t Current_Configuration;   /* Selected configuration */
-  uint8_t Current_Interface;       /* Selected interface of current configuration */
-  uint8_t Current_AlternateSetting;/* Selected Alternate Setting of current
-                                     interface*/
-
-  ENDPOINT_INFO Ctrl_Info;
-}DEVICE_INFO;
-
-typedef struct _DEVICE_PROP
-{
-  void (*Init)(void);        /* Initialize the device */
-  void (*Reset)(void);       /* Reset routine of this device */
-
-  /* Device dependent process after the status stage */
-  void (*Process_Status_IN)(void);
-  void (*Process_Status_OUT)(void);
-
-  /* Procedure of process on setup stage of a class specified request with data stage */
-  /* All class specified requests with data stage are processed in Class_Data_Setup
-   Class_Data_Setup()
-    responses to check all special requests and fills ENDPOINT_INFO
-    according to the request
-    If IN tokens are expected, then wLength & wOffset will be filled
-    with the total transferring bytes and the starting position
-    If OUT tokens are expected, then rLength & rOffset will be filled
-    with the total expected bytes and the starting position in the buffer
-
-    If the request is valid, Class_Data_Setup returns SUCCESS, else UNSUPPORT
-
-   CAUTION:
-    Since GET_CONFIGURATION & GET_INTERFACE are highly related to
-    the individual classes, they will be checked and processed here.
-  */
-  RESULT (*Class_Data_Setup)(uint8_t RequestNo);
-
-  /* Procedure of process on setup stage of a class specified request without data stage */
-  /* All class specified requests without data stage are processed in Class_NoData_Setup
-   Class_NoData_Setup
-    responses to check all special requests and perform the request
-
-   CAUTION:
-    Since SET_CONFIGURATION & SET_INTERFACE are highly related to
-    the individual classes, they will be checked and processed here.
-  */
-  RESULT (*Class_NoData_Setup)(uint8_t RequestNo);
-
-  /*Class_Get_Interface_Setting
-   This function is used by the file usb_core.c to test if the selected Interface
-   and Alternate Setting (uint8_t Interface, uint8_t AlternateSetting) are supported by
-   the application.
-   This function is writing by user. It should return "SUCCESS" if the Interface
-   and Alternate Setting are supported by the application or "UNSUPPORT" if they
-   are not supported. */
-
-  RESULT  (*Class_Get_Interface_Setting)(uint8_t Interface, uint8_t AlternateSetting);
-
-  uint8_t* (*GetDeviceDescriptor)(uint16_t Length);
-  uint8_t* (*GetConfigDescriptor)(uint16_t Length);
-  uint8_t* (*GetStringDescriptor)(uint16_t Length);
-
-  uint8_t* RxEP_buffer;
-  uint8_t MaxPacketSize;
-
-}DEVICE_PROP;
-
-typedef struct _USER_STANDARD_REQUESTS
-{
-  void (*User_GetConfiguration)(void);       /* Get Configuration */
-  void (*User_SetConfiguration)(void);       /* Set Configuration */
-  void (*User_GetInterface)(void);           /* Get Interface */
-  void (*User_SetInterface)(void);           /* Set Interface */
-  void (*User_GetStatus)(void);              /* Get Status */
-  void (*User_ClearFeature)(void);           /* Clear Feature */
-  void (*User_SetEndPointFeature)(void);     /* Set Endpoint Feature */
-  void (*User_SetDeviceFeature)(void);       /* Set Device Feature */
-  void (*User_SetDeviceAddress)(void);       /* Set Device Address */
-}
-USER_STANDARD_REQUESTS;
-
-/* Exported constants --------------------------------------------------------*/
-#define Type_Recipient (pInformation->USBbmRequestType & (REQUEST_TYPE | RECIPIENT))
-
-#define Usb_rLength Usb_wLength
-#define Usb_rOffset Usb_wOffset
-
-#define USBwValue USBwValues.w
-#define USBwValue0 USBwValues.bw.bb0
-#define USBwValue1 USBwValues.bw.bb1
-#define USBwIndex USBwIndexs.w
-#define USBwIndex0 USBwIndexs.bw.bb0
-#define USBwIndex1 USBwIndexs.bw.bb1
-#define USBwLength USBwLengths.w
-#define USBwLength0 USBwLengths.bw.bb0
-#define USBwLength1 USBwLengths.bw.bb1
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-uint8_t Setup0_Process(void);
-uint8_t Post0_Process(void);
-uint8_t Out0_Process(void);
-uint8_t In0_Process(void);
-
-RESULT Standard_SetEndPointFeature(void);
-RESULT Standard_SetDeviceFeature(void);
-
-uint8_t *Standard_GetConfiguration(uint16_t Length);
-RESULT Standard_SetConfiguration(void);
-uint8_t *Standard_GetInterface(uint16_t Length);
-RESULT Standard_SetInterface(void);
-uint8_t *Standard_GetDescriptorData(uint16_t Length, PONE_DESCRIPTOR pDesc);
-
-uint8_t *Standard_GetStatus(uint16_t Length);
-RESULT Standard_ClearFeature(void);
-void SetDeviceAddress(uint8_t);
-void NOP_Process(void);
-
-extern const DEVICE_PROP Device_Property;
-extern const USER_STANDARD_REQUESTS User_Standard_Requests;
-extern const DEVICE  Device_Table;
-extern DEVICE_INFO Device_Info;
-
-/* cells saving status during interrupt servicing */
-extern __IO uint16_t SaveRState;
-extern __IO uint16_t SaveTState;
-
-#endif /* __USB_CORE_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_def.h

@@ -1,80 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_def.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Definitions related to USB Core
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_DEF_H
-#define __USB_DEF_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-typedef enum _RECIPIENT_TYPE
-{
-  DEVICE_RECIPIENT,     /* Recipient device */
-  INTERFACE_RECIPIENT,  /* Recipient interface */
-  ENDPOINT_RECIPIENT,   /* Recipient endpoint */
-  OTHER_RECIPIENT
-} RECIPIENT_TYPE;
-
-
-typedef enum _STANDARD_REQUESTS
-{
-  GET_STATUS = 0,
-  CLEAR_FEATURE,
-  RESERVED1,
-  SET_FEATURE,
-  RESERVED2,
-  SET_ADDRESS,
-  GET_DESCRIPTOR,
-  SET_DESCRIPTOR,
-  GET_CONFIGURATION,
-  SET_CONFIGURATION,
-  GET_INTERFACE,
-  SET_INTERFACE,
-  TOTAL_sREQUEST,  /* Total number of Standard request */
-  SYNCH_FRAME = 12
-} STANDARD_REQUESTS;
-
-/* Definition of "USBwValue" */
-typedef enum _DESCRIPTOR_TYPE
-{
-  DEVICE_DESCRIPTOR = 1,
-  CONFIG_DESCRIPTOR,
-  STRING_DESCRIPTOR,
-  INTERFACE_DESCRIPTOR,
-  ENDPOINT_DESCRIPTOR
-} DESCRIPTOR_TYPE;
-
-/* Feature selector of a SET_FEATURE or CLEAR_FEATURE */
-typedef enum _FEATURE_SELECTOR
-{
-  ENDPOINT_STALL,
-  DEVICE_REMOTE_WAKEUP
-} FEATURE_SELECTOR;
-
-/* Exported constants --------------------------------------------------------*/
-/* Definition of "USBbmRequestType" */
-#define REQUEST_TYPE      0x60  /* Mask to get request type */
-#define STANDARD_REQUEST  0x00  /* Standard request */
-#define CLASS_REQUEST     0x20  /* Class request */
-#define VENDOR_REQUEST    0x40  /* Vendor request */
-
-#define RECIPIENT         0x1F  /* Mask to get recipient */
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#endif /* __USB_DEF_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_init.h

@@ -1,49 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_init.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Initialization routines & global variables
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_INIT_H
-#define __USB_INIT_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void USB_Init(void);
-
-/* External variables --------------------------------------------------------*/
-/*  The number of current endpoint, it will be used to specify an endpoint */
-extern uint8_t	EPindex;
-/*  The number of current device, it is an index to the Device_Table */
-/*extern uint8_t	Device_no; */
-/*  Points to the DEVICE_INFO structure of current device */
-/*  The purpose of this register is to speed up the execution */
-extern DEVICE_INFO*	pInformation;
-/*  Points to the DEVICE_PROP structure of current device */
-/*  The purpose of this register is to speed up the execution */
-extern const DEVICE_PROP*	pProperty;
-/*  Temporary save the state of Rx & Tx status. */
-/*  Whenever the Rx or Tx state is changed, its value is saved */
-/*  in this variable first and will be set to the EPRB or EPRA */
-/*  at the end of interrupt process */
-extern const USER_STANDARD_REQUESTS *pUser_Standard_Requests;
-
-extern uint16_t	SaveState ;
-extern uint16_t wInterrupt_Mask;
-
-#endif /* __USB_INIT_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_int.h

@@ -1,33 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_int.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Endpoint CTR (Low and High) interrupt's service routines
-*                      prototypes
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_INT_H
-#define __USB_INT_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void CTR_LP(void);
-void CTR_HP(void);
-
-/* External variables --------------------------------------------------------*/
-
-#endif /* __USB_INT_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_lib.h

@@ -1,50 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_lib.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : USB library include files
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_LIB_H
-#define __USB_LIB_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x.h"
-#include "usb_type.h"
-#include "usb_regs.h"
-#include "usb_def.h"
-#include "usb_core.h"
-#include "usb_init.h"
-#ifndef STM32F10X_CL
- #include "usb_mem.h"
- #include "usb_int.h"
-#endif /* STM32F10X_CL */
-
-#include "usb_sil.h"
-
-#ifdef STM32F10X_CL
- #include "otgd_fs_cal.h"
- #include "otgd_fs_pcd.h"
- #include "otgd_fs_dev.h"
- #include "otgd_fs_int.h"
-#endif /* STM32F10X_CL */
-
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-/* External variables --------------------------------------------------------*/
-
-#endif /* __USB_LIB_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_mem.h

@@ -1,32 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_mem.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Utility prototypes functions for memory/PMA transfers
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_MEM_H
-#define __USB_MEM_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void UserToPMABufferCopy(uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uint16_t wNBytes);
-void PMAToUserBufferCopy(uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uint16_t wNBytes);
-
-/* External variables --------------------------------------------------------*/
-
-#endif  /*__USB_MEM_H*/
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_regs.h

@@ -1,670 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_regs.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Interface prototype functions to USB cell registers
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_REGS_H
-#define __USB_REGS_H
-
-#ifndef STM32F10X_CL
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-typedef enum _EP_DBUF_DIR
-{
-  /* double buffered endpoint direction */
-  EP_DBUF_ERR,
-  EP_DBUF_OUT,
-  EP_DBUF_IN
-}EP_DBUF_DIR;
-
-/* endpoint buffer number */
-enum EP_BUF_NUM
-{
-  EP_NOBUF,
-  EP_BUF0,
-  EP_BUF1
-};
-
-/* Exported constants --------------------------------------------------------*/
-#define RegBase  (0x40005C00L)  /* USB_IP Peripheral Registers base address */
-#define PMAAddr  (0x40006000L)  /* USB_IP Packet Memory Area base address   */
-
-/******************************************************************************/
-/*                         General registers                                  */
-/******************************************************************************/
-
-/* Control register */
-#define CNTR    ((__IO unsigned *)(RegBase + 0x40))
-/* Interrupt status register */
-#define ISTR    ((__IO unsigned *)(RegBase + 0x44))
-/* Frame number register */
-#define FNR     ((__IO unsigned *)(RegBase + 0x48))
-/* Device address register */
-#define DADDR   ((__IO unsigned *)(RegBase + 0x4C))
-/* Buffer Table address register */
-#define BTABLE  ((__IO unsigned *)(RegBase + 0x50))
-/******************************************************************************/
-/*                         Endpoint registers                                 */
-/******************************************************************************/
-#define EP0REG  ((__IO unsigned *)(RegBase)) /* endpoint 0 register address */
-
-/* Endpoint Addresses (w/direction) */
-#define EP0_OUT     ((uint8_t)0x00)  
-#define EP0_IN      ((uint8_t)0x80) 
-#define EP1_OUT     ((uint8_t)0x01)  
-#define EP1_IN      ((uint8_t)0x81)  
-#define EP2_OUT     ((uint8_t)0x02)  
-#define EP2_IN      ((uint8_t)0x82)  
-#define EP3_OUT     ((uint8_t)0x03)  
-#define EP3_IN      ((uint8_t)0x83) 
-#define EP4_OUT     ((uint8_t)0x04)  
-#define EP4_IN      ((uint8_t)0x84)
-#define EP5_OUT     ((uint8_t)0x05)  
-#define EP5_IN      ((uint8_t)0x85)
-#define EP6_OUT     ((uint8_t)0x06)  
-#define EP6_IN      ((uint8_t)0x86)
-#define EP7_OUT     ((uint8_t)0x07)  
-#define EP7_IN      ((uint8_t)0x87)
-
-/* endpoints enumeration */
-#define ENDP0       ((uint8_t)0)
-#define ENDP1       ((uint8_t)1)
-#define ENDP2       ((uint8_t)2)
-#define ENDP3       ((uint8_t)3)
-#define ENDP4       ((uint8_t)4)
-#define ENDP5       ((uint8_t)5)
-#define ENDP6       ((uint8_t)6)
-#define ENDP7       ((uint8_t)7)
-
-/******************************************************************************/
-/*                       ISTR interrupt events                                */
-/******************************************************************************/
-#define ISTR_CTR    (0x8000) /* Correct TRansfer (clear-only bit) */
-#define ISTR_DOVR   (0x4000) /* DMA OVeR/underrun (clear-only bit) */
-#define ISTR_ERR    (0x2000) /* ERRor (clear-only bit) */
-#define ISTR_WKUP   (0x1000) /* WaKe UP (clear-only bit) */
-#define ISTR_SUSP   (0x0800) /* SUSPend (clear-only bit) */
-#define ISTR_RESET  (0x0400) /* RESET (clear-only bit) */
-#define ISTR_SOF    (0x0200) /* Start Of Frame (clear-only bit) */
-#define ISTR_ESOF   (0x0100) /* Expected Start Of Frame (clear-only bit) */
-
-
-#define ISTR_DIR    (0x0010)  /* DIRection of transaction (read-only bit)  */
-#define ISTR_EP_ID  (0x000F)  /* EndPoint IDentifier (read-only bit)  */
-
-#define CLR_CTR    (~ISTR_CTR)   /* clear Correct TRansfer bit */
-#define CLR_DOVR   (~ISTR_DOVR)  /* clear DMA OVeR/underrun bit*/
-#define CLR_ERR    (~ISTR_ERR)   /* clear ERRor bit */
-#define CLR_WKUP   (~ISTR_WKUP)  /* clear WaKe UP bit     */
-#define CLR_SUSP   (~ISTR_SUSP)  /* clear SUSPend bit     */
-#define CLR_RESET  (~ISTR_RESET) /* clear RESET bit      */
-#define CLR_SOF    (~ISTR_SOF)   /* clear Start Of Frame bit   */
-#define CLR_ESOF   (~ISTR_ESOF)  /* clear Expected Start Of Frame bit */
-
-/******************************************************************************/
-/*             CNTR control register bits definitions                         */
-/******************************************************************************/
-#define CNTR_CTRM   (0x8000) /* Correct TRansfer Mask */
-#define CNTR_DOVRM  (0x4000) /* DMA OVeR/underrun Mask */
-#define CNTR_ERRM   (0x2000) /* ERRor Mask */
-#define CNTR_WKUPM  (0x1000) /* WaKe UP Mask */
-#define CNTR_SUSPM  (0x0800) /* SUSPend Mask */
-#define CNTR_RESETM (0x0400) /* RESET Mask   */
-#define CNTR_SOFM   (0x0200) /* Start Of Frame Mask */
-#define CNTR_ESOFM  (0x0100) /* Expected Start Of Frame Mask */
-
-
-#define CNTR_RESUME (0x0010) /* RESUME request */
-#define CNTR_FSUSP  (0x0008) /* Force SUSPend */
-#define CNTR_LPMODE (0x0004) /* Low-power MODE */
-#define CNTR_PDWN   (0x0002) /* Power DoWN */
-#define CNTR_FRES   (0x0001) /* Force USB RESet */
-
-/******************************************************************************/
-/*                FNR Frame Number Register bit definitions                   */
-/******************************************************************************/
-#define FNR_RXDP (0x8000) /* status of D+ data line */
-#define FNR_RXDM (0x4000) /* status of D- data line */
-#define FNR_LCK  (0x2000) /* LoCKed */
-#define FNR_LSOF (0x1800) /* Lost SOF */
-#define FNR_FN  (0x07FF) /* Frame Number */
-/******************************************************************************/
-/*               DADDR Device ADDRess bit definitions                         */
-/******************************************************************************/
-#define DADDR_EF (0x80)
-#define DADDR_ADD (0x7F)
-/******************************************************************************/
-/*                            Endpoint register                               */
-/******************************************************************************/
-/* bit positions */
-#define EP_CTR_RX      (0x8000) /* EndPoint Correct TRansfer RX */
-#define EP_DTOG_RX     (0x4000) /* EndPoint Data TOGGLE RX */
-#define EPRX_STAT      (0x3000) /* EndPoint RX STATus bit field */
-#define EP_SETUP       (0x0800) /* EndPoint SETUP */
-#define EP_T_FIELD     (0x0600) /* EndPoint TYPE */
-#define EP_KIND        (0x0100) /* EndPoint KIND */
-#define EP_CTR_TX      (0x0080) /* EndPoint Correct TRansfer TX */
-#define EP_DTOG_TX     (0x0040) /* EndPoint Data TOGGLE TX */
-#define EPTX_STAT      (0x0030) /* EndPoint TX STATus bit field */
-#define EPADDR_FIELD   (0x000F) /* EndPoint ADDRess FIELD */
-
-/* EndPoint REGister MASK (no toggle fields) */
-#define EPREG_MASK     (EP_CTR_RX|EP_SETUP|EP_T_FIELD|EP_KIND|EP_CTR_TX|EPADDR_FIELD)
-
-/* EP_TYPE[1:0] EndPoint TYPE */
-#define EP_TYPE_MASK   (0x0600) /* EndPoint TYPE Mask */
-#define EP_BULK        (0x0000) /* EndPoint BULK */
-#define EP_CONTROL     (0x0200) /* EndPoint CONTROL */
-#define EP_ISOCHRONOUS (0x0400) /* EndPoint ISOCHRONOUS */
-#define EP_INTERRUPT   (0x0600) /* EndPoint INTERRUPT */
-#define EP_T_MASK      (~EP_T_FIELD & EPREG_MASK)
-
-
-/* EP_KIND EndPoint KIND */
-#define EPKIND_MASK    (~EP_KIND & EPREG_MASK)
-
-/* STAT_TX[1:0] STATus for TX transfer */
-#define EP_TX_DIS      (0x0000) /* EndPoint TX DISabled */
-#define EP_TX_STALL    (0x0010) /* EndPoint TX STALLed */
-#define EP_TX_NAK      (0x0020) /* EndPoint TX NAKed */
-#define EP_TX_VALID    (0x0030) /* EndPoint TX VALID */
-#define EPTX_DTOG1     (0x0010) /* EndPoint TX Data TOGgle bit1 */
-#define EPTX_DTOG2     (0x0020) /* EndPoint TX Data TOGgle bit2 */
-#define EPTX_DTOGMASK  (EPTX_STAT|EPREG_MASK)
-
-/* STAT_RX[1:0] STATus for RX transfer */
-#define EP_RX_DIS      (0x0000) /* EndPoint RX DISabled */
-#define EP_RX_STALL    (0x1000) /* EndPoint RX STALLed */
-#define EP_RX_NAK      (0x2000) /* EndPoint RX NAKed */
-#define EP_RX_VALID    (0x3000) /* EndPoint RX VALID */
-#define EPRX_DTOG1     (0x1000) /* EndPoint RX Data TOGgle bit1 */
-#define EPRX_DTOG2     (0x2000) /* EndPoint RX Data TOGgle bit1 */
-#define EPRX_DTOGMASK  (EPRX_STAT|EPREG_MASK)
-/* Exported macro ------------------------------------------------------------*/
-/* SetCNTR */
-#define _SetCNTR(wRegValue)  (*CNTR   = (uint16_t)wRegValue)
-
-/* SetISTR */
-#define _SetISTR(wRegValue)  (*ISTR   = (uint16_t)wRegValue)
-
-/* SetDADDR */
-#define _SetDADDR(wRegValue) (*DADDR  = (uint16_t)wRegValue)
-
-/* SetBTABLE */
-#define _SetBTABLE(wRegValue)(*BTABLE = (uint16_t)(wRegValue & 0xFFF8))
-
-/* GetCNTR */
-#define _GetCNTR()   ((uint16_t) *CNTR)
-
-/* GetISTR */
-#define _GetISTR()   ((uint16_t) *ISTR)
-
-/* GetFNR */
-#define _GetFNR()    ((uint16_t) *FNR)
-
-/* GetDADDR */
-#define _GetDADDR()  ((uint16_t) *DADDR)
-
-/* GetBTABLE */
-#define _GetBTABLE() ((uint16_t) *BTABLE)
-
-/* SetENDPOINT */
-#define _SetENDPOINT(bEpNum,wRegValue)  (*(EP0REG + bEpNum)= \
-    (uint16_t)wRegValue)
-
-/* GetENDPOINT */
-#define _GetENDPOINT(bEpNum)        ((uint16_t)(*(EP0REG + bEpNum)))
-
-/*******************************************************************************
-* Macro Name     : SetEPType
-* Description    : sets the type in the endpoint register(bits EP_TYPE[1:0])
-* Input          : bEpNum: Endpoint Number. 
-*                  wType											 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPType(bEpNum,wType) (_SetENDPOINT(bEpNum,\
-                                  ((_GetENDPOINT(bEpNum) & EP_T_MASK) | wType )))
-
-/*******************************************************************************
-* Macro Name     : GetEPType
-* Description    : gets the type in the endpoint register(bits EP_TYPE[1:0]) 
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint Type
-*******************************************************************************/
-#define _GetEPType(bEpNum) (_GetENDPOINT(bEpNum) & EP_T_FIELD)
-
-/*******************************************************************************
-* Macro Name     : SetEPTxStatus
-* Description    : sets the status for tx transfer (bits STAT_TX[1:0]).
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPTxStatus(bEpNum,wState) {\
-    register uint16_t _wRegVal;       \
-    _wRegVal = _GetENDPOINT(bEpNum) & EPTX_DTOGMASK;\
-    /* toggle first bit ? */     \
-    if((EPTX_DTOG1 & wState)!= 0)      \
-      _wRegVal ^= EPTX_DTOG1;        \
-    /* toggle second bit ?  */         \
-    if((EPTX_DTOG2 & wState)!= 0)      \
-      _wRegVal ^= EPTX_DTOG2;        \
-    _SetENDPOINT(bEpNum, (_wRegVal | EP_CTR_RX|EP_CTR_TX));    \
-  } /* _SetEPTxStatus */
-
-/*******************************************************************************
-* Macro Name     : SetEPRxStatus
-* Description    : sets the status for rx transfer (bits STAT_TX[1:0])
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPRxStatus(bEpNum,wState) {\
-    register uint16_t _wRegVal;   \
-    \
-    _wRegVal = _GetENDPOINT(bEpNum) & EPRX_DTOGMASK;\
-    /* toggle first bit ? */  \
-    if((EPRX_DTOG1 & wState)!= 0) \
-      _wRegVal ^= EPRX_DTOG1;  \
-    /* toggle second bit ? */  \
-    if((EPRX_DTOG2 & wState)!= 0) \
-      _wRegVal ^= EPRX_DTOG2;  \
-    _SetENDPOINT(bEpNum, (_wRegVal | EP_CTR_RX|EP_CTR_TX)); \
-  } /* _SetEPRxStatus */
-
-/*******************************************************************************
-* Macro Name     : SetEPRxTxStatus
-* Description    : sets the status for rx & tx (bits STAT_TX[1:0] & STAT_RX[1:0])
-* Input          : bEpNum: Endpoint Number. 
-*                  wStaterx: new state.
-*                  wStatetx: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPRxTxStatus(bEpNum,wStaterx,wStatetx) {\
-    register uint32_t _wRegVal;   \
-    \
-    _wRegVal = _GetENDPOINT(bEpNum) & (EPRX_DTOGMASK |EPTX_STAT) ;\
-    /* toggle first bit ? */  \
-    if((EPRX_DTOG1 & wStaterx)!= 0) \
-      _wRegVal ^= EPRX_DTOG1;  \
-    /* toggle second bit ? */  \
-    if((EPRX_DTOG2 & wStaterx)!= 0) \
-      _wRegVal ^= EPRX_DTOG2;  \
-    /* toggle first bit ? */     \
-    if((EPTX_DTOG1 & wStatetx)!= 0)      \
-      _wRegVal ^= EPTX_DTOG1;        \
-    /* toggle second bit ?  */         \
-    if((EPTX_DTOG2 & wStatetx)!= 0)      \
-      _wRegVal ^= EPTX_DTOG2;        \
-    _SetENDPOINT(bEpNum, _wRegVal | EP_CTR_RX|EP_CTR_TX);    \
-  } /* _SetEPRxTxStatus */
-/*******************************************************************************
-* Macro Name     : GetEPTxStatus / GetEPRxStatus 
-* Description    : gets the status for tx/rx transfer (bits STAT_TX[1:0]
-*                  /STAT_RX[1:0])
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : status .
-*******************************************************************************/
-#define _GetEPTxStatus(bEpNum) ((uint16_t)_GetENDPOINT(bEpNum) & EPTX_STAT)
-
-#define _GetEPRxStatus(bEpNum) ((uint16_t)_GetENDPOINT(bEpNum) & EPRX_STAT)
-
-/*******************************************************************************
-* Macro Name     : SetEPTxValid / SetEPRxValid 
-* Description    : sets directly the VALID tx/rx-status into the enpoint register
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPTxValid(bEpNum)     (_SetEPTxStatus(bEpNum, EP_TX_VALID))
-
-#define _SetEPRxValid(bEpNum)     (_SetEPRxStatus(bEpNum, EP_RX_VALID))
-
-/*******************************************************************************
-* Macro Name     : GetTxStallStatus / GetRxStallStatus.
-* Description    : checks stall condition in an endpoint.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : TRUE = endpoint in stall condition.
-*******************************************************************************/
-#define _GetTxStallStatus(bEpNum) (_GetEPTxStatus(bEpNum) \
-                                   == EP_TX_STALL)
-#define _GetRxStallStatus(bEpNum) (_GetEPRxStatus(bEpNum) \
-                                   == EP_RX_STALL)
-
-/*******************************************************************************
-* Macro Name     : SetEP_KIND / ClearEP_KIND.
-* Description    : set & clear EP_KIND bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEP_KIND(bEpNum)    (_SetENDPOINT(bEpNum, \
-                                (EP_CTR_RX|EP_CTR_TX|((_GetENDPOINT(bEpNum) | EP_KIND) & EPREG_MASK))))
-#define _ClearEP_KIND(bEpNum)  (_SetENDPOINT(bEpNum, \
-                                (EP_CTR_RX|EP_CTR_TX|(_GetENDPOINT(bEpNum) & EPKIND_MASK))))
-
-/*******************************************************************************
-* Macro Name     : Set_Status_Out / Clear_Status_Out.
-* Description    : Sets/clears directly STATUS_OUT bit in the endpoint register.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _Set_Status_Out(bEpNum)    _SetEP_KIND(bEpNum)
-#define _Clear_Status_Out(bEpNum)  _ClearEP_KIND(bEpNum)
-
-/*******************************************************************************
-* Macro Name     : SetEPDoubleBuff / ClearEPDoubleBuff.
-* Description    : Sets/clears directly EP_KIND bit in the endpoint register.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPDoubleBuff(bEpNum)   _SetEP_KIND(bEpNum)
-#define _ClearEPDoubleBuff(bEpNum) _ClearEP_KIND(bEpNum)
-
-/*******************************************************************************
-* Macro Name     : ClearEP_CTR_RX / ClearEP_CTR_TX.
-* Description    : Clears bit CTR_RX / CTR_TX in the endpoint register.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _ClearEP_CTR_RX(bEpNum)   (_SetENDPOINT(bEpNum,\
-                                   _GetENDPOINT(bEpNum) & 0x7FFF & EPREG_MASK))
-#define _ClearEP_CTR_TX(bEpNum)   (_SetENDPOINT(bEpNum,\
-                                   _GetENDPOINT(bEpNum) & 0xFF7F & EPREG_MASK))
-
-/*******************************************************************************
-* Macro Name     : ToggleDTOG_RX / ToggleDTOG_TX .
-* Description    : Toggles DTOG_RX / DTOG_TX bit in the endpoint register.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _ToggleDTOG_RX(bEpNum)    (_SetENDPOINT(bEpNum, \
-                                   EP_CTR_RX|EP_CTR_TX|EP_DTOG_RX | (_GetENDPOINT(bEpNum) & EPREG_MASK)))
-#define _ToggleDTOG_TX(bEpNum)    (_SetENDPOINT(bEpNum, \
-                                   EP_CTR_RX|EP_CTR_TX|EP_DTOG_TX | (_GetENDPOINT(bEpNum) & EPREG_MASK)))
-
-/*******************************************************************************
-* Macro Name     : ClearDTOG_RX / ClearDTOG_TX.
-* Description    : Clears DTOG_RX / DTOG_TX bit in the endpoint register.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _ClearDTOG_RX(bEpNum)  if((_GetENDPOINT(bEpNum) & EP_DTOG_RX) != 0)\
-    _ToggleDTOG_RX(bEpNum)
-#define _ClearDTOG_TX(bEpNum)  if((_GetENDPOINT(bEpNum) & EP_DTOG_TX) != 0)\
-    _ToggleDTOG_TX(bEpNum)
-/*******************************************************************************
-* Macro Name     : SetEPAddress.
-* Description    : Sets address in an endpoint register.
-* Input          : bEpNum: Endpoint Number.
-*                  bAddr: Address. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPAddress(bEpNum,bAddr) _SetENDPOINT(bEpNum,\
-    EP_CTR_RX|EP_CTR_TX|(_GetENDPOINT(bEpNum) & EPREG_MASK) | bAddr)
-
-/*******************************************************************************
-* Macro Name     : GetEPAddress.
-* Description    : Gets address in an endpoint register.
-* Input          : bEpNum: Endpoint Number.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _GetEPAddress(bEpNum) ((uint8_t)(_GetENDPOINT(bEpNum) & EPADDR_FIELD))
-
-#define _pEPTxAddr(bEpNum) ((uint32_t *)((_GetBTABLE()+bEpNum*8  )*2 + PMAAddr))
-#define _pEPTxCount(bEpNum) ((uint32_t *)((_GetBTABLE()+bEpNum*8+2)*2 + PMAAddr))
-#define _pEPRxAddr(bEpNum) ((uint32_t *)((_GetBTABLE()+bEpNum*8+4)*2 + PMAAddr))
-#define _pEPRxCount(bEpNum) ((uint32_t *)((_GetBTABLE()+bEpNum*8+6)*2 + PMAAddr))
-
-/*******************************************************************************
-* Macro Name     : SetEPTxAddr / SetEPRxAddr.
-* Description    : sets address of the tx/rx buffer.
-* Input          : bEpNum: Endpoint Number.
-*                  wAddr: address to be set (must be word aligned).
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPTxAddr(bEpNum,wAddr) (*_pEPTxAddr(bEpNum) = ((wAddr >> 1) << 1))
-#define _SetEPRxAddr(bEpNum,wAddr) (*_pEPRxAddr(bEpNum) = ((wAddr >> 1) << 1))
-
-/*******************************************************************************
-* Macro Name     : GetEPTxAddr / GetEPRxAddr.
-* Description    : Gets address of the tx/rx buffer.
-* Input          : bEpNum: Endpoint Number.
-* Output         : None.
-* Return         : address of the buffer.
-*******************************************************************************/
-#define _GetEPTxAddr(bEpNum) ((uint16_t)*_pEPTxAddr(bEpNum))
-#define _GetEPRxAddr(bEpNum) ((uint16_t)*_pEPRxAddr(bEpNum))
-
-/*******************************************************************************
-* Macro Name     : SetEPCountRxReg.
-* Description    : Sets counter of rx buffer with no. of blocks.
-* Input          : pdwReg: pointer to counter.
-*                  wCount: Counter.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _BlocksOf32(dwReg,wCount,wNBlocks) {\
-    wNBlocks = wCount >> 5;\
-    if((wCount & 0x1f) == 0)\
-      wNBlocks--;\
-    *pdwReg = (uint32_t)((wNBlocks << 10) | 0x8000);\
-  }/* _BlocksOf32 */
-
-#define _BlocksOf2(dwReg,wCount,wNBlocks) {\
-    wNBlocks = wCount >> 1;\
-    if((wCount & 0x1) != 0)\
-      wNBlocks++;\
-    *pdwReg = (uint32_t)(wNBlocks << 10);\
-  }/* _BlocksOf2 */
-
-#define _SetEPCountRxReg(dwReg,wCount)  {\
-    uint16_t wNBlocks;\
-    if(wCount > 62){_BlocksOf32(dwReg,wCount,wNBlocks);}\
-    else {_BlocksOf2(dwReg,wCount,wNBlocks);}\
-  }/* _SetEPCountRxReg */
-
-
-
-#define _SetEPRxDblBuf0Count(bEpNum,wCount) {\
-    uint32_t *pdwReg = _pEPTxCount(bEpNum); \
-    _SetEPCountRxReg(pdwReg, wCount);\
-  }
-/*******************************************************************************
-* Macro Name     : SetEPTxCount / SetEPRxCount.
-* Description    : sets counter for the tx/rx buffer.
-* Input          : bEpNum: endpoint number.
-*                  wCount: Counter value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPTxCount(bEpNum,wCount) (*_pEPTxCount(bEpNum) = wCount)
-#define _SetEPRxCount(bEpNum,wCount) {\
-    uint32_t *pdwReg = _pEPRxCount(bEpNum); \
-    _SetEPCountRxReg(pdwReg, wCount);\
-  }
-/*******************************************************************************
-* Macro Name     : GetEPTxCount / GetEPRxCount.
-* Description    : gets counter of the tx buffer.
-* Input          : bEpNum: endpoint number.
-* Output         : None.
-* Return         : Counter value.
-*******************************************************************************/
-#define _GetEPTxCount(bEpNum)((uint16_t)(*_pEPTxCount(bEpNum)) & 0x3ff)
-#define _GetEPRxCount(bEpNum)((uint16_t)(*_pEPRxCount(bEpNum)) & 0x3ff)
-
-/*******************************************************************************
-* Macro Name     : SetEPDblBuf0Addr / SetEPDblBuf1Addr.
-* Description    : Sets buffer 0/1 address in a double buffer endpoint.
-* Input          : bEpNum: endpoint number.
-*                : wBuf0Addr: buffer 0 address.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPDblBuf0Addr(bEpNum,wBuf0Addr) {_SetEPTxAddr(bEpNum, wBuf0Addr);}
-#define _SetEPDblBuf1Addr(bEpNum,wBuf1Addr) {_SetEPRxAddr(bEpNum, wBuf1Addr);}
-
-/*******************************************************************************
-* Macro Name     : SetEPDblBuffAddr.
-* Description    : Sets addresses in a double buffer endpoint.
-* Input          : bEpNum: endpoint number.
-*                : wBuf0Addr: buffer 0 address.
-*                : wBuf1Addr = buffer 1 address.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPDblBuffAddr(bEpNum,wBuf0Addr,wBuf1Addr) { \
-    _SetEPDblBuf0Addr(bEpNum, wBuf0Addr);\
-    _SetEPDblBuf1Addr(bEpNum, wBuf1Addr);\
-  } /* _SetEPDblBuffAddr */
-
-/*******************************************************************************
-* Macro Name     : GetEPDblBuf0Addr / GetEPDblBuf1Addr.
-* Description    : Gets buffer 0/1 address of a double buffer endpoint.
-* Input          : bEpNum: endpoint number.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _GetEPDblBuf0Addr(bEpNum) (_GetEPTxAddr(bEpNum))
-#define _GetEPDblBuf1Addr(bEpNum) (_GetEPRxAddr(bEpNum))
-
-/*******************************************************************************
-* Macro Name     : SetEPDblBuffCount / SetEPDblBuf0Count / SetEPDblBuf1Count.
-* Description    : Gets buffer 0/1 address of a double buffer endpoint.
-* Input          : bEpNum: endpoint number.
-*                : bDir: endpoint dir  EP_DBUF_OUT = OUT 
-*                                      EP_DBUF_IN  = IN 
-*                : wCount: Counter value    
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _SetEPDblBuf0Count(bEpNum, bDir, wCount)  { \
-    if(bDir == EP_DBUF_OUT)\
-      /* OUT endpoint */ \
-    {_SetEPRxDblBuf0Count(bEpNum,wCount);} \
-    else if(bDir == EP_DBUF_IN)\
-      /* IN endpoint */ \
-      *_pEPTxCount(bEpNum) = (uint32_t)wCount;  \
-  } /* SetEPDblBuf0Count*/
-
-#define _SetEPDblBuf1Count(bEpNum, bDir, wCount)  { \
-    if(bDir == EP_DBUF_OUT)\
-      /* OUT endpoint */ \
-    {_SetEPRxCount(bEpNum,wCount);}\
-    else if(bDir == EP_DBUF_IN)\
-      /* IN endpoint */\
-      *_pEPRxCount(bEpNum) = (uint32_t)wCount; \
-  } /* SetEPDblBuf1Count */
-
-#define _SetEPDblBuffCount(bEpNum, bDir, wCount) {\
-    _SetEPDblBuf0Count(bEpNum, bDir, wCount); \
-    _SetEPDblBuf1Count(bEpNum, bDir, wCount); \
-  } /* _SetEPDblBuffCount  */
-
-/*******************************************************************************
-* Macro Name     : GetEPDblBuf0Count / GetEPDblBuf1Count.
-* Description    : Gets buffer 0/1 rx/tx counter for double buffering.
-* Input          : bEpNum: endpoint number.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-#define _GetEPDblBuf0Count(bEpNum) (_GetEPTxCount(bEpNum))
-#define _GetEPDblBuf1Count(bEpNum) (_GetEPRxCount(bEpNum))
-
-
-/* External variables --------------------------------------------------------*/
-extern __IO uint16_t wIstr;  /* ISTR register last read value */
-
-/* Exported functions ------------------------------------------------------- */
-void SetCNTR(uint16_t /*wRegValue*/);
-void SetISTR(uint16_t /*wRegValue*/);
-void SetDADDR(uint16_t /*wRegValue*/);
-void SetBTABLE(uint16_t /*wRegValue*/);
-uint16_t GetCNTR(void);
-uint16_t GetISTR(void);
-uint16_t GetFNR(void);
-uint16_t GetDADDR(void);
-uint16_t GetBTABLE(void);
-void SetENDPOINT(uint8_t /*bEpNum*/, uint16_t /*wRegValue*/);
-uint16_t GetENDPOINT(uint8_t /*bEpNum*/);
-void SetEPType(uint8_t /*bEpNum*/, uint16_t /*wType*/);
-uint16_t GetEPType(uint8_t /*bEpNum*/);
-void SetEPTxStatus(uint8_t /*bEpNum*/, uint16_t /*wState*/);
-void SetEPRxStatus(uint8_t /*bEpNum*/, uint16_t /*wState*/);
-void SetDouBleBuffEPStall(uint8_t /*bEpNum*/, uint8_t bDir);
-uint16_t GetEPTxStatus(uint8_t /*bEpNum*/);
-uint16_t GetEPRxStatus(uint8_t /*bEpNum*/);
-void SetEPTxValid(uint8_t /*bEpNum*/);
-void SetEPRxValid(uint8_t /*bEpNum*/);
-uint16_t GetTxStallStatus(uint8_t /*bEpNum*/);
-uint16_t GetRxStallStatus(uint8_t /*bEpNum*/);
-void SetEP_KIND(uint8_t /*bEpNum*/);
-void ClearEP_KIND(uint8_t /*bEpNum*/);
-void Set_Status_Out(uint8_t /*bEpNum*/);
-void Clear_Status_Out(uint8_t /*bEpNum*/);
-void SetEPDoubleBuff(uint8_t /*bEpNum*/);
-void ClearEPDoubleBuff(uint8_t /*bEpNum*/);
-void ClearEP_CTR_RX(uint8_t /*bEpNum*/);
-void ClearEP_CTR_TX(uint8_t /*bEpNum*/);
-void ToggleDTOG_RX(uint8_t /*bEpNum*/);
-void ToggleDTOG_TX(uint8_t /*bEpNum*/);
-void ClearDTOG_RX(uint8_t /*bEpNum*/);
-void ClearDTOG_TX(uint8_t /*bEpNum*/);
-void SetEPAddress(uint8_t /*bEpNum*/, uint8_t /*bAddr*/);
-uint8_t GetEPAddress(uint8_t /*bEpNum*/);
-void SetEPTxAddr(uint8_t /*bEpNum*/, uint16_t /*wAddr*/);
-void SetEPRxAddr(uint8_t /*bEpNum*/, uint16_t /*wAddr*/);
-uint16_t GetEPTxAddr(uint8_t /*bEpNum*/);
-uint16_t GetEPRxAddr(uint8_t /*bEpNum*/);
-void SetEPCountRxReg(uint32_t * /*pdwReg*/, uint16_t /*wCount*/);
-void SetEPTxCount(uint8_t /*bEpNum*/, uint16_t /*wCount*/);
-void SetEPRxCount(uint8_t /*bEpNum*/, uint16_t /*wCount*/);
-uint16_t GetEPTxCount(uint8_t /*bEpNum*/);
-uint16_t GetEPRxCount(uint8_t /*bEpNum*/);
-void SetEPDblBuf0Addr(uint8_t /*bEpNum*/, uint16_t /*wBuf0Addr*/);
-void SetEPDblBuf1Addr(uint8_t /*bEpNum*/, uint16_t /*wBuf1Addr*/);
-void SetEPDblBuffAddr(uint8_t /*bEpNum*/, uint16_t /*wBuf0Addr*/, uint16_t /*wBuf1Addr*/);
-uint16_t GetEPDblBuf0Addr(uint8_t /*bEpNum*/);
-uint16_t GetEPDblBuf1Addr(uint8_t /*bEpNum*/);
-void SetEPDblBuffCount(uint8_t /*bEpNum*/, uint8_t /*bDir*/, uint16_t /*wCount*/);
-void SetEPDblBuf0Count(uint8_t /*bEpNum*/, uint8_t /*bDir*/, uint16_t /*wCount*/);
-void SetEPDblBuf1Count(uint8_t /*bEpNum*/, uint8_t /*bDir*/, uint16_t /*wCount*/);
-uint16_t GetEPDblBuf0Count(uint8_t /*bEpNum*/);
-uint16_t GetEPDblBuf1Count(uint8_t /*bEpNum*/);
-EP_DBUF_DIR GetEPDblBufDir(uint8_t /*bEpNum*/);
-void FreeUserBuffer(uint8_t bEpNum/*bEpNum*/, uint8_t bDir);
-uint16_t ToWord(uint8_t, uint8_t);
-uint16_t ByteSwap(uint16_t);
-
-#endif /* STM32F10X_CL */
-
-#endif /* __USB_REGS_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_sil.h

@@ -1,34 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_sil.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Simplified Interface Layer function prototypes.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_SIL_H
-#define __USB_SIL_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-uint32_t USB_SIL_Init(void);
-uint32_t USB_SIL_Write(uint8_t bEpAddr, uint8_t* pBufferPointer, uint32_t wBufferSize);
-uint32_t USB_SIL_Read(uint8_t bEpAddr, uint8_t* pBufferPointer);
-
-/* External variables --------------------------------------------------------*/
-
-#endif /* __USB_SIL_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/inc/usb_type.h

@@ -1,74 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_type.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Type definitions used by the USB Library
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_TYPE_H
-#define __USB_TYPE_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_conf.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
-#ifndef __STM32F10x_H
-
-typedef signed long      s32;
-typedef signed short     s16;
-typedef signed char      s8;
-
-typedef volatile signed long      vs32;
-typedef volatile signed short     vs16;
-typedef volatile signed char      vs8;
-
-typedef unsigned long       u32;
-typedef unsigned short      u16;
-typedef unsigned char       u8;
-
-typedef unsigned long  const    uc32;  /* Read Only */
-typedef unsigned short const    uc16;  /* Read Only */
-typedef unsigned char  const    uc8;   /* Read Only */
-
-typedef volatile unsigned long      vu32;
-typedef volatile unsigned short     vu16;
-typedef volatile unsigned char      vu8;
-
-typedef volatile unsigned long  const    vuc32;  /* Read Only */
-typedef volatile unsigned short const    vuc16;  /* Read Only */
-typedef volatile unsigned char  const    vuc8;   /* Read Only */
-
-
-typedef enum
-{
-  FALSE = 0, TRUE  = !FALSE
-}
-bool;
-
-typedef enum { RESET = 0, SET   = !RESET } FlagStatus, ITStatus;
-
-typedef enum { DISABLE = 0, ENABLE  = !DISABLE} FunctionalState;
-
-typedef enum { ERROR = 0, SUCCESS  = !ERROR} ErrorStatus;
-#endif
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-/* External variables --------------------------------------------------------*/
-
-#endif /* __USB_TYPE_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/src/otgd_fs_dev.c

@@ -1,386 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : otgd_fs_dev.c
-* Author             : STMicroelectronics
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : High Layer device mode interface and wrapping layer.
-********************************************************************************
-* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-#ifdef STM32F10X_CL
-
-/* Includes ------------------------------------------------------------------*/
-#include "otgd_fs_dev.h"
-#include "usb_regs.h"
-#include "otgd_fs_cal.h"
-#include "otgd_fs_pcd.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : OTG_DEV_Init
-* Description    : Initialize the OTG Device IP and EP0.
-* Input          : None.
-* Output         : None.
-* Return         : None. 
-*******************************************************************************/
-void OTG_DEV_Init(void)
-{
-  EP_DESCRIPTOR ep_descriptor;
-  USB_OTG_EP *ep;
-  
-  /* Set the OTG_USB base registers address */
-  OTGD_FS_SetAddress(USB_OTG_FS1_BASE_ADDR);
-  
-  /* Disable all global interrupts */
-  OTGD_FS_DisableGlobalInt();
-
-  /*Init the Core (common init.) */
-  OTGD_FS_CoreInit();
-
-  /* Init Device */
-  OTGD_FS_CoreInitDev();
-
-  /* Init internal driver structure */
-  OTGD_FS_PCD_Init();
-  
-  /* Configure and open the IN control EP0 */ 
-  ep_descriptor.bEndpointAddress = 0x80;
-  ep_descriptor.wMaxPacketSize = 64;  
-  ep_descriptor.bmAttributes = USB_ENDPOINT_XFER_CONTROL; 
-  OTGD_FS_PCD_EP_Open(&ep_descriptor);
-  
-  /* Configure and open the OUT control EP0 */ 
-  ep_descriptor.bEndpointAddress = 0x00;
-  OTGD_FS_PCD_EP_Open(&ep_descriptor);    
-
-
-  ep = OTGD_FS_PCD_GetOutEP(0);
-  OTGD_FS_EPStartXfer(ep);
-  
-  /* Enable EP0 to start receiving setup packets */  
-  OTGD_FS_PCD_EP0_OutStart();  
-  
-  /* Enable USB Global interrupt */
-  OTGD_FS_EnableGlobalInt();     
-}
-
-
-/*******************************************************************************
-* Function Name  : OTG_DEV_EP_Init
-* Description    : Initialize the selected endpoint parameters
-* Input          : - bEpAdd: address of the endpoint (epnum|epdir) 
-*                     expample: EP1 OUT -> 0x01 and EP1 IN 0x81.
-*                  - bEpType: OTG_DEV_EP_TYPE_CONTROL, OTG_DEV_EP_TYPE_ISOC, 
-*                     OTG_DEV_EP_TYPE_BULK, OTG_DEV_EP_TYPE_INT
-*                  - wEpMaxPackSize: The EP max packet size.
-* Output         : None.
-* Return         : Status: New status to be set for the endpoint: 
-*******************************************************************************/
-void OTG_DEV_EP_Init(uint8_t bEpAdd, uint8_t bEpType, uint16_t wEpMaxPackSize)
-{
-  EP_DESCRIPTOR ep_descriptor;
-  USB_OTG_EP *ep;
-  
-  /* Set the EP parameters in a structure */
-  ep_descriptor.bEndpointAddress = bEpAdd;
-  ep_descriptor.bmAttributes = bEpType; 
-  ep_descriptor.wMaxPacketSize = wEpMaxPackSize;
-
-  OTGD_FS_PCD_EP_Flush(bEpAdd);
-  
-  /* Open the EP with entered parameters */   
-  OTGD_FS_PCD_EP_Open(&ep_descriptor); 
-  
-  /* Activate the EP if it is an OUT EP */
-  if ((bEpAdd & 0x80) == 0)
-  {
-    ep = OTGD_FS_PCD_GetOutEP(bEpAdd & 0x7F);
-    OTGD_FS_EPStartXfer(ep);
-  } 
-  else
-  {
-    ep = OTGD_FS_PCD_GetInEP(bEpAdd & 0x7F);
-    ep->even_odd_frame = 0;    
-    OTG_DEV_SetEPTxStatus(bEpAdd, DEV_EP_TX_NAK);
-  }
-  
-}
-
-/*******************************************************************************
-* Function Name  : OTG_DEV_GetEPTxStatus
-* Description    : Set the related endpoint status.
-* Input          : Number of the endpoint.
-* Output         : None.
-* Return         : Status: New status to be set for the endpoint: 
-*******************************************************************************/
-uint32_t OTG_DEV_GetEPTxStatus(uint8_t bEpnum) 
-{
-  USB_OTG_EP *ep;
-  uint32_t status = 0;
-  
-  ep = OTGD_FS_PCD_GetInEP(bEpnum & 0x7F); 
-  
-  status = OTGD_FS_Dev_GetEPStatus(ep); 
-  
-  return status; 
-}
-
-/*******************************************************************************
-* Function Name  : OTG_DEV_GetEPRxStatus
-* Description    : returns the related endpoint status.
-* Input          : Number of the endpoint.
-* Output         : None.
-* Return         : Status: New status to be set for the endpoint: 
-*******************************************************************************/
-uint32_t OTG_DEV_GetEPRxStatus(uint8_t bEpnum)
-{
-  USB_OTG_EP *ep;
-  uint32_t status = 0;
-  
-  ep = OTGD_FS_PCD_GetOutEP(bEpnum & 0x7F); 
-  
-  status = OTGD_FS_Dev_GetEPStatus(ep); 
-  
-  return status;
-}
-
-/*******************************************************************************
-* Function Name  : OTG_DEV_SetEPTxStatus
-* Description    : Sets the related endpoint status.
-* Input          : - bEpnum: Number of the endpoint.
-*                  - Status: New status to be set for the endpoint. It can be
-*                    DEV_EP_TX_VALID, DEV_EP_TX_STALL, DEV_EP_TX_NAK or 
-*                    DEV_EP_TX_DISABLE.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void OTG_DEV_SetEPTxStatus(uint8_t bEpnum, uint32_t Status) 
-{
-  USB_OTG_EP *ep;
-   
-  ep = OTGD_FS_PCD_GetInEP(bEpnum & 0x7F); 
-  
-  if ((bEpnum == 0x80) && (Status == DEV_EP_TX_STALL))
-  {
-    ep->is_in = 1;
-  }
-  
-  OTGD_FS_Dev_SetEPStatus(ep, Status); 
-}
-
-/*******************************************************************************
-* Function Name  : OTG_DEV_SetEPRxStatus
-* Description    : Sets the related endpoint status.
-* Input          : - bEpnum: Number of the endpoint.
-*                  - Status: New status to be set for the endpoint. It can be
-*                    DEV_EP_RX_VALID, DEV_EP_RX_STALL, DEV_EP_RX_NAK or 
-*                    DEV_EP_RX_DISABLE.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void OTG_DEV_SetEPRxStatus(uint8_t bEpnum, uint32_t Status)                           
-{
-  USB_OTG_EP *ep;
- 
-  ep = OTGD_FS_PCD_GetOutEP(bEpnum & 0x7F); 
-  
-  OTGD_FS_Dev_SetEPStatus(ep, Status); 
-}
-
-/*******************************************************************************
-* Function Name  : USB_DevDisconnect
-* Description    : Disconnect the Pullup resist.
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void USB_DevDisconnect(void)
-{
-  OTGD_FS_PCD_DevDisconnect();
-}
-
-/*******************************************************************************
-* Function Name  : USB_DevConnect
-* Description    : Disconnect the .
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void USB_DevConnect(void)
-{
-  OTGD_FS_PCD_DevConnect();
-}
-
-/*-*-*-*-*-*-*-*-*-* Replace the usb_regs.h defines -*-*-*-*-*-*-*-*-*-*-*-*-*/
-
-/*******************************************************************************
-* Function Name  : SetEPTxStatus
-* Description    : Set the status of Tx endpoint.
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPTxStatus(uint8_t bEpNum, uint16_t wState)
-{
-  _SetEPTxStatus(bEpNum, wState);
-}
-
-/*******************************************************************************
-* Function Name  : SetEPRxStatus
-* Description    : Set the status of Rx endpoint.
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPRxStatus(uint8_t bEpNum, uint16_t wState)
-{
-  _SetEPRxStatus(bEpNum, wState);
-}
-
-/*******************************************************************************
-* Function Name  : GetEPTxStatus
-* Description    : Returns the endpoint Tx status.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint TX Status
-*******************************************************************************/
-uint16_t GetEPTxStatus(uint8_t bEpNum) 
-{
-  return(_GetEPTxStatus(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : GetEPRxStatus
-* Description    : Returns the endpoint Rx status.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint RX Status
-*******************************************************************************/
-uint16_t GetEPRxStatus(uint8_t bEpNum) 
-{
-  return(_GetEPRxStatus(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : SetEPTxValid
-* Description    : Valid the endpoint Tx Status.
-* Input          : bEpNum: Endpoint Number.  
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPTxValid(uint8_t bEpNum)
-{
-  _SetEPTxStatus(bEpNum, EP_TX_VALID);
-}
-
-/*******************************************************************************
-* Function Name  : SetEPRxValid
-* Description    : Valid the endpoint Rx Status.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPRxValid(uint8_t bEpNum)
-{
-  _SetEPRxStatus(bEpNum, EP_RX_VALID);
-}
-
-/*******************************************************************************
-* Function Name  : GetTxStallStatus
-* Description    : Returns the Stall status of the Tx endpoint.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Tx Stall status.
-*******************************************************************************/
-uint16_t GetTxStallStatus(uint8_t bEpNum)
-{
-  return(_GetTxStallStatus(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : GetRxStallStatus
-* Description    : Returns the Stall status of the Rx endpoint. 
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Rx Stall status.
-*******************************************************************************/
-uint16_t GetRxStallStatus(uint8_t bEpNum)
-{
-  return(_GetRxStallStatus(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : SetEPTxCount.
-* Description    : Set the Tx count.
-* Input          : bEpNum: Endpoint Number.
-*                  wCount: new count value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPTxCount(uint8_t bEpNum, uint16_t wCount)
-{
-}
-
-/*******************************************************************************
-* Function Name  : SetEPRxCount
-* Description    : Set the Rx count.
-* Input          : bEpNum: Endpoint Number. 
-*                  wCount: the new count value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPRxCount(uint8_t bEpNum, uint16_t wCount)
-{ 
-}
-
-/*******************************************************************************
-* Function Name  : ToWord
-* Description    : merge two byte in a word.
-* Input          : bh: byte high, bl: bytes low.
-* Output         : None.
-* Return         : resulted word.
-*******************************************************************************/
-uint16_t ToWord(uint8_t bh, uint8_t bl)
-{
-  uint16_t wRet = 0;
-  wRet = (uint16_t)bl | ((uint16_t)bh << 8);
-  return(wRet);
-}
-
-/*******************************************************************************
-* Function Name  : ByteSwap
-* Description    : Swap two byte in a word.
-* Input          : wSwW: word to Swap.
-* Output         : None.
-* Return         : resulted word.
-*******************************************************************************/
-uint16_t ByteSwap(uint16_t wSwW)
-{
-  uint8_t bTemp = 0;
-  uint16_t wRet = 0;
-  
-  bTemp = (uint8_t)(wSwW & 0xff);
-  wRet =  (wSwW >> 8) | ((uint16_t)bTemp << 8);
-  return(wRet);
-}
-
-#endif /* STM32F10X_CL */
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/src/otgd_fs_int.c

@@ -1,874 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : otgd_fs_int.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Endpoint interrupt's service routines.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-#ifdef STM32F10X_CL
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x.h"
-#include "usb_type.h"
-#include "otgd_fs_int.h"
-#include "usb_lib.h"
-#include "usb_istr.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Max size of the received OUT Non periodic packet */
-#define MAX_OUT_PKT_SIZE    160
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-
-uint8_t USBD_Data_Buffer  [MAX_OUT_PKT_SIZE];
-__IO uint8_t IsocBuff [(ISOC_BUFFER_SZE * NUM_SUB_BUFFERS)];
-__IO uint32_t IsocBufferIdx = 0;
-
-extern USB_OTG_CORE_REGS  core_regs;
-
-__IO uint16_t SaveRState;
-__IO uint16_t SaveTState;
-
-/* Extern variables ----------------------------------------------------------*/
-extern void (*pEpInt_IN[7])(void);    /*  Handles IN  interrupts   */
-extern void (*pEpInt_OUT[7])(void);   /*  Handles OUT interrupts   */
-
-/* Private function prototypes -----------------------------------------------*/
-static uint32_t OTGD_FS_PCD_ReadDevInEP( USB_OTG_EP *ep);
-static enum usb_device_speed OTGD_FS_PCD_GetDeviceSpeed(void);
-static uint32_t OTGD_FS_PCD_WriteEmptyTxFifo(uint32_t epnum);
-
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_ModeMismatch_ISR
-* Description    : Handles the Mode Mismatch error interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_ModeMismatch_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;
-  gintsts.d32 = 0 ;
-  
-  INTR_MODEMISMATCH_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.modemismatch = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_Sof_ISR
-* Description    : Handles the Start Of Frame detected interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_Sof_ISR(void)
-{
-  USB_OTG_int_sts_data int_sts ;
-  int_sts.d32 = 0;
-  
-  /* Call user function */
-  INTR_SOFINTR_Callback();
-    
-  /* Clear interrupt */
-  int_sts.b.sofintr = 1;
-  WRITE_REG32 (&core_regs.common_regs->int_sts, int_sts.d32);
-
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_RxStatusQueueLevel_ISR
-* Description    : Handles the Rx Status Queue Level Interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_RxStatusQueueLevel_ISR(void)
-{
-  USB_OTG_int_msk_data int_mask;
-  USB_OTG_dev_rx_sts_data status;
-  USB_OTG_EP *ep;
-
-  int_mask.d32 = 0;
-  status.d32 = 0;
-  
-  /* Disable the Rx Status Queue Level interrupt */
-  int_mask.b.rxstsqlvl = 1;
-  MODIFY_REG32( &core_regs.common_regs->int_msk, int_mask.d32, 0);
-
-  /* Get the Status from the top of the FIFO */
-  status.d32 = READ_REG32( &core_regs.common_regs->rx_stsp );
-
-  /* Get the related endpoint structure */
-  ep = OTGD_FS_PCD_GetOutEP(status.b.epnum);
-
-  switch (status.b.pktsts)
-  {
-    case STS_GOUT_NAK:
-      break;
-    case STS_DATA_UPDT:
-      if (status.b.bcnt)
-      {
-        if (ep->type == EP_TYPE_ISOC)
-        {
-          /* Call user function */
-          INTR_RXSTSQLVL_ISODU_Callback();         
-          
-          /* Copy the received buffer to the RAM */
-          OTGD_FS_ReadPacket((uint8_t*)(IsocBuff + (ISOC_BUFFER_SZE * IsocBufferIdx)), status.b.bcnt);
-          ep->xfer_buff = (uint8_t*)(IsocBuff + (ISOC_BUFFER_SZE * IsocBufferIdx));  
-          
-          /* Check if the end of the global buffer has been reached */
-          if (IsocBufferIdx == (NUM_SUB_BUFFERS - 1))
-          {
-            /* Reset the buffer index */
-            IsocBufferIdx = 0;                         
-          }
-          else
-          {
-            /* Increment the buffer index */
-            IsocBufferIdx ++;
-          }          
-        }
-        else
-        {
-          /* Copy the received buffer to the RAM */
-          OTGD_FS_ReadPacket(USBD_Data_Buffer, status.b.bcnt);
-          ep->xfer_buff = USBD_Data_Buffer;
-        }
-        
-        /* Update the endpoint structure */
-        ep->xfer_len  = status.b.bcnt;
-        ep->xfer_count += status.b.bcnt;        
-      }
-      break;
-    case STS_XFER_COMP:
-      break;
-    case STS_SETUP_COMP:
-      break;
-    case STS_SETUP_UPDT:
-      /* Copy the setup packet received in Fifo into the setup buffer in RAM */
-      OTGD_FS_ReadPacket(USBD_Data_Buffer, 8); 
-      ep->xfer_buff = USBD_Data_Buffer;
-      ep->xfer_count += status.b.bcnt;
-      ep->xfer_len  = status.b.bcnt;
-      break;
-    default:
-      break;
-  }
-
-  /* Call the user function */
-  INTR_RXSTSQLVL_Callback();
-  
-  /* Enable the Rx Status Queue Level interrupt */
-  MODIFY_REG32( &core_regs.common_regs->int_msk, 0, int_mask.d32);
-  
-  /* Clear interrupt: this is a read only bit, it cannot be cleared by register 
-     access */
-
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_NPTxFE_ISR
-* Description    : Handles the Non Periodic Tx FIFO Empty interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_NPTxFE_ISR(void )
-{
-  USB_OTG_int_msk_data gintmsk;
-  gintmsk.d32 = 0; 
-  
-  /* Call the user function */
-  INTR_NPTXFEMPTY_Callback();
-  
-  gintmsk.b.nptxfempty = 1;
-  MODIFY_REG32(&core_regs.common_regs->int_msk, gintmsk.d32, 0 );
-  
-  /* Clear interrupt: This bit is a read only bit, cannot be cleared 
-     by register access */
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_GInNakEff_ISR
-* Description    : Handles the Global IN Endpoints NAK Effective interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_GInNakEff_ISR(void)
-{
- 
-  /* Call user function */
-  INTR_GINNAKEFF_Callback();
-  
-  /* Clear interrupt: This is a read only bit, it cannot be cleared by register 
-     access */
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_GOutNakEff_ISR
-* Description    : Handles the Global OUT Endpoints NAK Effective interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_GOutNakEff_ISR(void)
-{
-  /* Call user function */
-  INTR_GOUTNAKEFF_Callback();  
-  
-  /* Clear interrupt: This is a read only bit, it cannot be cleared by register 
-     access */
-
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_EarlySuspend_ISR
-* Description    : Handles the Early Suspend detected interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_EarlySuspend_ISR(void )
-{
-  USB_OTG_int_sts_data gintsts;
-  USB_OTG_int_msk_data gintmsk;
-
-  gintsts.d32 = 0;
-  gintmsk.d32 = 0;
-  
-  
-  /* Call user function */
-  INTR_ERLYSUSPEND_Callback();  
-  
-  gintmsk.b.erlysuspend = 1;
-  MODIFY_REG32(&core_regs.common_regs->int_msk, gintmsk.d32, 0 );
-
-  /* Clear interrupt */
-  gintsts.b.erlysuspend = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_USBSuspend_ISR
-* Description    : Handles the Suspend condition detected interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_USBSuspend_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;  
-  
-  gintsts.d32 = 0;
-  /* Call user function */
-  INTR_USBSUSPEND_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.usbsuspend = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_UsbReset_ISR
-* Description    : This interrupt occurs when a USB Reset is detected.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_UsbReset_ISR(void)
-{
-  USB_OTG_dev_all_int_data daintmsk;
-  USB_OTG_dev_out_ep_msk_data doepmsk;
-  USB_OTG_dev_in_ep_msk_data diepmsk;
-  USB_OTG_dev_cfg_data dcfg;
-  USB_OTG_dev_ctl_data dctl;
-  USB_OTG_int_sts_data gintsts;
-  
-  daintmsk.d32 = 0;
-  doepmsk.d32 = 0;
-  diepmsk.d32 = 0;
-  dcfg.d32 =0;
-  dctl.d32 = 0;
-  gintsts.d32 = 0;
-
-  /* Clear the Remote Wakeup Signalling */
-  dctl.b.rmtwkupsig = 1;
-  MODIFY_REG32(&core_regs.dev_regs->dev_ctl, dctl.d32, 0 );
-
-  /* Flush the NP Tx FIFO */
-  OTGD_FS_FlushTxFifo( 0 );
-
-  daintmsk.b.inep0 = 1;
-  daintmsk.b.outep0 = 1;
-  WRITE_REG32( &core_regs.dev_regs->dev_all_int_msk, daintmsk.d32 );
-
-  doepmsk.b.setup = 1;
-  doepmsk.b.xfercompl = 1;
-  doepmsk.b.ahberr = 1;
-  doepmsk.b.epdisabled = 1;
-  WRITE_REG32( &core_regs.dev_regs->dev_out_ep_msk, doepmsk.d32 );
-
-  diepmsk.b.xfercompl = 1;
-  diepmsk.b.timeout = 1;
-  diepmsk.b.epdisabled = 1;
-  diepmsk.b.ahberr = 1;
-  diepmsk.b.intknepmis = 1;
-  WRITE_REG32( &core_regs.dev_regs->dev_in_ep_msk, diepmsk.d32 );
-
-  /* Reset Device Address */
-  dcfg.d32 = READ_REG32( &core_regs.dev_regs->dev_cfg);
-  dcfg.b.devaddr = 0;
-  WRITE_REG32( &core_regs.dev_regs->dev_cfg, dcfg.d32);
-
-  /* setup EP0 to receive SETUP packets */
-  OTGD_FS_PCD_EP0_OutStart();
-
-  /* Clear interrupt */
-  gintsts.d32 = 0;
-  gintsts.b.usbreset = 1;
-  WRITE_REG32 (&core_regs.common_regs->int_sts, gintsts.d32);
-
-  /* Call the user reset function */
-  OTGD_FS_DEVICE_RESET; 
-  
-  /* Call user function */
-  INTR_USBRESET_Callback();  
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_EnumDone_ISR
-* Description    : Reads the device status register and set the device speed
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_EnumDone_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;
-  USB_OTG_usb_cfg_data gusbcfg;
-
-  gintsts.d32 = 0;
-  gusbcfg.d32 = 0;
-  
-  OTGD_FS_EP0Activate();
-
-  /* Set USB turnaround time based on device speed and PHY interface. */
-  gusbcfg.d32 = READ_REG32(&core_regs.common_regs->usb_cfg);
-
-  /* Full or low speed */
-  if ( OTGD_FS_PCD_GetDeviceSpeed() == USB_SPEED_FULL)
-  {
-    gusbcfg.b.usbtrdtim = 9;
-  }
-  WRITE_REG32(&core_regs.common_regs->usb_cfg, gusbcfg.d32);
-
-  /* Call user function */
-  INTR_ENUMDONE_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.enumdone = 1;
-  WRITE_REG32( &core_regs.common_regs->int_sts, gintsts.d32 );
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_IsoOutDrop_ISR
-* Description    : Handles the Isochrounous Out packet Dropped interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_IsoOutDrop_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;  
-
-  gintsts.d32 = 0;
-  /* Call user function */
-  INTR_ISOOUTDROP_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.isooutdrop = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_EOPF_ISR
-* Description    : Handles the Expexted End Of Periodic Frame interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_EOPF_ISR(void )
-{
-  USB_OTG_int_sts_data gintsts;
-  USB_OTG_int_msk_data gintmsk;
-  
-  gintsts.d32 = 0;
-  gintmsk.d32 = 0;
-  
-  gintmsk.b.eopframe = 1;
-  MODIFY_REG32(&core_regs.common_regs->int_msk, gintmsk.d32, 0 );
-
-  /* Call user function */
-  INTR_EOPFRAME_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.eopframe = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_EPMismatch_ISR
-* Description    : Handles the Endpoint Mismatch error interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_EPMismatch_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;  
-  
-  gintsts.d32 = 0;
-  
-  /* Call user function */
-  INTR_EPMISMATCH_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.epmismatch = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_InEP_ISR
-* Description    : Handles all IN endpoints interrupts.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_InEP_ISR(void)
-{
-  USB_OTG_dev_in_ep_int_data diepint;
-
-  uint32_t ep_intr = 0;
-  uint32_t epnum = 0;
-  USB_OTG_EP *ep;
-  uint32_t fifoemptymsk = 0;
-
-  diepint.d32 = 0;  
-  ep_intr = OTGD_FS_ReadDevAllInEPItr();
-  while ( ep_intr )
-  {
-    if (ep_intr&0x1) /* In ITR */
-    {
-      ep = OTGD_FS_PCD_GetInEP(epnum);
-      diepint.d32 = OTGD_FS_PCD_ReadDevInEP(ep); /* Get In ITR status */
-      if ( diepint.b.xfercompl )
-      {
-        fifoemptymsk = 0x1 << ep->num;
-        MODIFY_REG32(&core_regs.dev_regs->dev_fifo_empty_msk, fifoemptymsk, 0);
-
-        /* Clear the Interrupt flag */ 
-        CLEAR_IN_EP_INTR(epnum, xfercompl);
-        
-        if (epnum == 0)  
-        {        
-          /* Call the core IN process for EP0 */ 
-          In0_Process();
-          
-          /* before terminate set Tx & Rx status */
-          OTG_DEV_SetEPRxStatus(epnum, SaveRState);
-          OTG_DEV_SetEPTxStatus(epnum, SaveTState);
-        }
-        else
-        {
-          OTG_DEV_SetEPTxStatus((epnum | 0x80 ), DEV_EP_TX_NAK);
-
-          (*pEpInt_IN[epnum -1])();
-          
-          /* Toggle Endpoint frame ID */
-          if (ep->even_odd_frame == 0)
-            ep->even_odd_frame = 1;
-          else
-            ep->even_odd_frame = 0;
-        } 
-      }
-      if ( diepint.b.ahberr )
-      {
-        CLEAR_IN_EP_INTR(epnum, ahberr);
-      }
-      if ( diepint.b.timeout )
-      {
-        CLEAR_IN_EP_INTR(epnum, timeout);
-      }
-      if (diepint.b.intktxfemp)
-      {
-        CLEAR_IN_EP_INTR(epnum, intktxfemp);
-      }
-      if (diepint.b.intknepmis)
-      {
-        CLEAR_IN_EP_INTR(epnum, intknepmis);
-      }
-      if (diepint.b.inepnakeff)
-      {
-        CLEAR_IN_EP_INTR(epnum, inepnakeff);
-      }
-      if (diepint.b.emptyintr)
-      {      
-         if ((epnum == 0) || (OTG_DEV_GetEPTxStatus(epnum) == DEV_EP_TX_VALID))
-        {
-          OTGD_FS_PCD_WriteEmptyTxFifo(epnum);          
-        }
-
-        CLEAR_IN_EP_INTR(epnum, emptyintr);          
-      }
-      if ( diepint.b.epdisabled )
-      { 
-        /* Reset Endpoint Frame ID to 0 */
-        ep->even_odd_frame = 0;
-
-        CLEAR_IN_EP_INTR(epnum, epdisabled);
-      }      
-    }
-    epnum++;
-    ep_intr >>= 1;
-  }
-
-  /* Call user function */
-  INTR_INEPINTR_Callback();
-  
-  return 1;
-}
-
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_OutEP_ISR
-* Description    : Handles all OUT endpoints interrupts.
-* Input          : None
-* Output         : None
-* Return         : Status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_OutEP_ISR(void)
-{
-  uint32_t ep_intr = 0;
-  USB_OTG_dev_out_ep_int_data doepint;
-  uint32_t epnum = 0;
-  USB_OTG_EP *ep;
-  
-  doepint.d32 = 0;
-
-  /* Read in the device interrupt bits */
-  ep_intr = OTGD_FS_ReadDevAllOutEp_itr();
-  
-  while ( ep_intr )
-  {
-    if (ep_intr&0x1)
-    {
-      /* Get EP pointer */
-      ep = OTGD_FS_PCD_GetOutEP(epnum);
-      doepint.d32 = OTGD_FS_ReadDevOutEP_itr(ep);
-
-      /* Transfer complete */
-      if ( doepint.b.xfercompl )
-      {
-        /* Clear the bit in DOEPINTn for this interrupt */
-        CLEAR_OUT_EP_INTR(epnum, xfercompl);
-        
-        if (epnum == 0)  
-        { 
-          /* Call the OUT process for the EP0 */
-          Out0_Process();
-        }
-        else
-        {
-          (*pEpInt_OUT[epnum-1])();
-        }
-      }
-      /* Endpoint disable  */
-      if ( doepint.b.epdisabled )
-      {
-        /* Clear the bit in DOEPINTn for this interrupt */
-        CLEAR_OUT_EP_INTR(epnum, epdisabled);
-      }
-      /* AHB Error */
-      if ( doepint.b.ahberr )
-      {
-        CLEAR_OUT_EP_INTR(epnum, ahberr);
-      }
-      /* Setup Phase Done (control EPs) */
-      if ( doepint.b.setup )
-      {
-        if (epnum == 0)  
-        {        
-          /* Call the SETUP process for the EP0 */
-          Setup0_Process();  
-
-          /* Before exit, update the Tx status */
-          OTG_DEV_SetEPTxStatus(0x80, SaveTState);  
-        }
-        else
-        {
-          /* Other control endpoints */
-        }  
-        
-        /* Clear the EP Interrupt */
-        CLEAR_OUT_EP_INTR(epnum, setup);
-      }
-    }
-    epnum++;
-    ep_intr >>= 1;
-  }
-
-  /* Call user function */
-  INTR_OUTEPINTR_Callback();  
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_IncomplIsoIn_ISR
-* Description    : Handles the Incomplete Isochrous IN tranfer error interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_IncomplIsoIn_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;  
-  
-  gintsts.d32 = 0;
-
-  /* Call user function */
-  INTR_INCOMPLISOIN_Callback(); 
-  
-  /* Clear interrupt */
-  gintsts.b.incomplisoin = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_IncomplIsoOut_ISR
-* Description    : Handles the Incomplete Isochrous OUT tranfer error interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_IncomplIsoOut_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;  
-
-  gintsts.d32 = 0;
-  
-  /* Call user function */
-  INTR_INCOMPLISOOUT_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.outepintr = 1;
-  WRITE_REG32(&core_regs.common_regs->int_sts, gintsts.d32);
-  
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_Handle_Wakeup_ISR
-* Description    : Handles the Wakeup or Remote Wakeup detected interrupt.
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_Handle_Wakeup_ISR(void)
-{
-  USB_OTG_int_sts_data gintsts;
-
-  gintsts.d32 = 0;
-  /* Call user function */
-  INTR_WKUPINTR_Callback();
-  
-  /* Clear interrupt */
-  gintsts.b.wkupintr = 1;
-  WRITE_REG32 (&core_regs.common_regs->int_sts, gintsts.d32);
-
-  return 1;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_GetDeviceSpeed
-* Description    : Get the device speed from the device status register
-* Input          : None
-* Output         : None
-* Return         : The Device speed value.
-*******************************************************************************/
-static enum usb_device_speed OTGD_FS_PCD_GetDeviceSpeed(void)
-{
-  USB_OTG_dev_sts_data dsts;
-  enum usb_device_speed speed = USB_SPEED_UNKNOWN;
-    
-  dsts.d32 = 0;
-    
-  dsts.d32 = READ_REG32(&core_regs.dev_regs->dev_sts);
-
-  switch (dsts.b.enumspd)
-  {
-    case DSTS_ENUMSPD_HS_PHY_30MHZ_OR_60MHZ:
-      speed = USB_SPEED_HIGH;
-      break;
-    case DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ:
-    case DSTS_ENUMSPD_FS_PHY_48MHZ:
-      speed = USB_SPEED_FULL;
-      break;
-
-    case DSTS_ENUMSPD_LS_PHY_6MHZ:
-      speed = USB_SPEED_LOW;
-      break;
-  }
-
-  return speed;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_ReadDevInEP
-* Description    : Reads all the Endpoints flags.
-* Input          : None
-* Output         : None
-* Return         : Status
-*******************************************************************************/
-static uint32_t OTGD_FS_PCD_ReadDevInEP( USB_OTG_EP *ep)
-{
-  uint32_t v = 0, msk = 0, emp=0;
-  
-  msk = READ_REG32(&core_regs.dev_regs->dev_in_ep_msk);
-  emp = READ_REG32(&core_regs.dev_regs->dev_fifo_empty_msk);
-  msk |= ((emp >> ep->num) & 0x1) << 7;
-  v = READ_REG32(&core_regs.inep_regs[ep->num]->dev_in_ep_int) & msk;
-  
-  return v;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_WriteEmptyTxFifo
-* Description    : Checks Fifo for the next packet to be loaded.
-* Input          : None
-* Output         : None
-* Return         : Status
-*******************************************************************************/
-static uint32_t OTGD_FS_PCD_WriteEmptyTxFifo(uint32_t epnum)
-{
-  USB_OTG_dev_tx_fifo_sts_data txstatus;
-  USB_OTG_EP *ep;
-  uint32_t len = 0;
-  uint32_t dwords = 0;
-  USB_OTG_dev_ep_ctl_data  depctl;
-  
-  
-  txstatus.d32 = 0;
-  depctl.d32 = 0;
-  
-  ep = OTGD_FS_PCD_GetInEP(epnum); 
-  
-  len = ep->xfer_len - ep->xfer_count;
-
-  if (len > ep->maxpacket)
-  {
-    len = ep->maxpacket;
-  }
-  
-  dwords = (len + 3) / 4;
-  txstatus.d32 = READ_REG32( &core_regs.inep_regs[epnum]->dev_tx_fifo_sts);
-
-  /* Manage the case of 0-length data packets toggling data PID */
-  if ((ep->xfer_len == 0) && (ep->xfer_count == 0))
-  {
-    if (ep->num > 0)
-    {
-      depctl.d32 = READ_REG32( &core_regs.inep_regs[epnum]->dev_in_ep_ctl);      
-      if (ep->even_odd_frame == 1)
-      {
-        depctl.b.setd0pid = 0;
-        depctl.b.setd1pid = 1;
-      }
-      else
-      {
-        depctl.b.setd0pid = 1;
-        depctl.b.setd1pid = 0;
-      }      
-      WRITE_REG32( &core_regs.inep_regs[epnum]->dev_in_ep_ctl, depctl.d32);           
-    }
-  }
-
-  
-  while  ((txstatus.b.txfspcavail > dwords) &&
-          (ep->xfer_count < ep->xfer_len) &&
-          (ep->xfer_len) != 0)
-  {
-    if (ep->num > 0)
-    {
-      depctl.d32 = READ_REG32( &core_regs.inep_regs[epnum]->dev_in_ep_ctl);      
-      if (ep->even_odd_frame == 0)
-      {
-        depctl.b.setd0pid = 1;
-        depctl.b.setd1pid = 0;
-      }
-      else
-      {
-        depctl.b.setd0pid = 0;
-        depctl.b.setd1pid = 1;
-      }      
-      WRITE_REG32( &core_regs.inep_regs[epnum]->dev_in_ep_ctl, depctl.d32);           
-    }
-    
-    /* Write the FIFO */
-    len = ep->xfer_len - ep->xfer_count;
-
-    if (len > ep->maxpacket)
-    {
-      len = ep->maxpacket;
-    }
-    dwords = (len + 3) / 4;
-
-    OTGD_FS_WritePacket(ep->xfer_buff, epnum, len);    
-    
-    ep->xfer_count += len;
-    ep->xfer_buff += len; 
-
-    txstatus.d32 = READ_REG32(&core_regs.inep_regs[epnum]->dev_tx_fifo_sts);   
-  }
-  
-  return 1;
-}
-#endif  /* STM32F10X_CL */
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/src/otgd_fs_pcd.c

@@ -1,454 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : otgd_fs_pcd.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Peripheral Device Interface low layer.
-********************************************************************************
-* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-#ifdef STM32F10X_CL
-
-#include "usb_lib.h"
-#include "otgd_fs_cal.h"
-#include "otgd_fs_pcd.h"
-
-USB_OTG_PCD_DEV USB_OTG_PCD_dev;
-
-extern USB_OTG_CORE_REGS     core_regs;
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_Init
-* Description    : Initialize the USB Device portion of the driver.
-* Input          : None
-* Output         : None
-* Return         : None
-*******************************************************************************/
-void OTGD_FS_PCD_Init(void)
-{
-  uint32_t i = 0;
-  USB_OTG_EP *ep;
-
-  ep = &USB_OTG_PCD_dev.ep0;
-  USB_OTG_PCD_dev.ep0state = 0;
-
-  /* Init ep structure */
-  ep->num = 0;
-  ep->tx_fifo_num = 0;
-
-  /* Control until ep is actvated */
-  ep->type = EP_TYPE_CTRL;
-  ep->maxpacket = MAX_PACKET_SIZE;
-
-  ep->xfer_buff = 0;
-  ep->xfer_len = 0;
-
-  for (i = 1; i < MAX_TX_FIFOS ; i++)
-  {
-    ep = &USB_OTG_PCD_dev.in_ep[i-1];
-
-    /* Init ep structure */
-    ep->is_in = 1;
-    ep->num = i;
-    ep->tx_fifo_num = i;
-
-    /* Control until ep is actvated */
-    ep->type = EP_TYPE_CTRL;
-    ep->maxpacket = MAX_PACKET_SIZE;
-    ep->xfer_buff = 0;
-    ep->xfer_len = 0;
-  }
-
-  for (i = 1; i < MAX_TX_FIFOS; i++)
-  {
-    ep = &USB_OTG_PCD_dev.out_ep[i-1];
-
-    /* Init ep structure */
-    ep->is_in = 0;
-    ep->num = i;
-    ep->tx_fifo_num = i;
-
-    /* Control until ep is activated */
-    ep->type = EP_TYPE_CTRL;
-    ep->maxpacket = MAX_PACKET_SIZE;
-    ep->xfer_buff = 0;
-    ep->xfer_len = 0;
-  }
-
-  USB_OTG_PCD_dev.ep0.maxpacket = MAX_EP0_SIZE;
-  USB_OTG_PCD_dev.ep0.type = EP_TYPE_CTRL;
-
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_EP_Open
-* Description    : Configure an Endpoint
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_PCD_EP_Open(EP_DESCRIPTOR *epdesc)
-{
-  USB_OTG_EP *ep;
-
-
-  if ((0x80 & epdesc->bEndpointAddress) != 0)
-  {
-    ep = OTGD_FS_PCD_GetInEP(epdesc->bEndpointAddress & 0x7F);
-    ep->is_in = 1;
-  }
-  else
-  {
-    ep = OTGD_FS_PCD_GetOutEP(epdesc->bEndpointAddress & 0x7F);
-    ep->is_in = 0;
-  }
-
-  ep->num   = epdesc->bEndpointAddress & 0x7F;
-  ep->maxpacket = epdesc->wMaxPacketSize;
-  ep->type = epdesc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
-
-  if (ep->is_in)
-  {
-    /* Assign a Tx FIFO */
-    ep->tx_fifo_num = ep->num;
-  }
-  
-  /* Set initial data PID. */
-  if ((epdesc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK )
-  {
-    ep->data_pid_start = 0;
-  }
-
-  OTGD_FS_EPActivate(ep );
-
-  return 0;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_EP_Close
-* Description    : Called when an EP is disabled
-* Input          : Endpoint address.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_PCD_EP_Close(uint8_t  ep_addr)
-{
-
-  USB_OTG_EP *ep;
-
-  if ((0x80 & ep_addr) != 0)
-  {
-    ep = OTGD_FS_PCD_GetInEP(ep_addr & 0x7F);
-  }
-  else
-  {
-    ep = OTGD_FS_PCD_GetOutEP(ep_addr & 0x7F);
-  }
-
-  ep->num   = ep_addr & 0x7F;
-  ep->is_in = (0x80 & ep_addr) != 0;
-
-  OTGD_FS_EPDeactivate(ep );
-  return 0;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_EP_Read
-* Description    : Read data from Fifo
-* Input          : Endpoint address.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t OTGD_FS_PCD_EP_Read (uint8_t ep_addr, uint8_t *pbuf, uint32_t buf_len)
-{
-  USB_OTG_EP *ep;
-  uint32_t i = 0;
-
-  ep = OTGD_FS_PCD_GetOutEP(ep_addr & 0x7F);
-
-  /* copy received data into application buffer */
-  for (i = 0 ; i < buf_len ; i++)
-  {
-    pbuf[i] = ep->xfer_buff[i];
-  }
-
-  /*setup and start the Xfer */
-  ep->xfer_buff = pbuf;
-  ep->xfer_len = buf_len;
-  ep->xfer_count = 0;
-  ep->is_in = 0;
-  ep->num = ep_addr & 0x7F;
-
-  if ( ep->num == 0 )
-  {
-    OTGD_FS_EP0StartXfer(ep);
-  }
-  else if (USB_OTG_PCD_dev.ep0state == 0)
-  {
-    OTGD_FS_EPStartXfer( ep );
-  }
-
-  return 0;
-}
-
-/*******************************************************************************
-* Function Name  : USBF_EP_Write
-* Description    : Read data from Fifo
-* Input          : ep
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t  OTGD_FS_PCD_EP_Write (uint8_t ep_addr, uint8_t *pbuf, uint32_t buf_len)
-{
-  USB_OTG_EP *ep;
-
-  ep = OTGD_FS_PCD_GetInEP(ep_addr & 0x7f);
-
-  /* assign data to EP structure buffer */
-  ep->xfer_buff = pbuf;
-
-  /* Setup and start the Transfer */
-  ep->xfer_count = 0;
-  ep->xfer_len = buf_len;
-  ep->is_in = 1;
-  ep->num = ep_addr & 0x7F;
-  
-  if ( ep->num == 0 )
-  {
-    OTGD_FS_EP0StartXfer(ep);
-  }
-  else if (USB_OTG_PCD_dev.ep0state == 0)
-  {
-    OTGD_FS_EPStartXfer( ep );
-  }
-
-  return 0;
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_EP_Stall
-* Description    : Stall an endpoint.
-* Input          : Endpoint Address.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t  OTGD_FS_PCD_EP_Stall (uint8_t ep_addr)
-{
-  USB_OTG_EP *ep;
-
-  if ((0x80 & ep_addr) != 0)
-  {
-    ep = OTGD_FS_PCD_GetInEP(ep_addr & 0x7F);
-  }
-  else
-  {
-    ep = OTGD_FS_PCD_GetOutEP(ep_addr & 0x7F);
-  }
-
-  ep->num   = ep_addr & 0x7F;
-  ep->is_in = ((ep_addr & 0x80) == 0x80) ? 1 : 0;
-
-  OTGD_FS_EPSetStall(ep);
-  return (0);
-}
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_EP_ClrStall
-* Description    : Clear stall condition on endpoints.
-* Input          : Endpoint Address.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t  OTGD_FS_PCD_EP_ClrStall (uint8_t ep_addr)
-{
-
-  USB_OTG_EP *ep;
-
-  if ((0x80 & ep_addr) != 0)
-  {
-    ep = OTGD_FS_PCD_GetInEP(ep_addr & 0x7F);
-  }
-  else
-  {
-    ep = OTGD_FS_PCD_GetOutEP(ep_addr & 0x7F);
-  }
-
-  ep->num   = ep_addr & 0x7F;
-  ep->is_in = ((ep_addr & 0x80) == 0x80) ? 1 : 0;
-
-  OTGD_FS_EPClearStall(ep);
-
-  return (0);
-}
-
-/*******************************************************************************
-* Function Name  : USBF_FCD_EP_Flush()
-* Description    : This Function flushes the buffer.
-* Input          : Endpoint Address.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-uint32_t  OTGD_FS_PCD_EP_Flush (uint8_t ep_addr)
-{
-
-  uint8_t  is_out = 0;
-  uint8_t  ep_nbr = 0;
-
-  ep_nbr   = ep_addr & 0x7F;
-  is_out = ((ep_addr & 0x80) == 0x80) ? 0 : 1;
-
-  if (is_out == 0)
-  {
-    OTGD_FS_FlushTxFifo(ep_nbr);
-  }
-  else
-  {
-    OTGD_FS_FlushRxFifo();
-  }
-  OTGD_FS_PCD_EP_ClrStall(ep_addr);
-  return (0);
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_EP_SetAddress
-* Description    : This Function set USB device address
-* Input          : The new device Address to be set.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-void  OTGD_FS_PCD_EP_SetAddress (uint8_t address)
-{
-
-  USB_OTG_dev_cfg_data dcfg;
-
-  dcfg.d32 = 0;
-  
-  dcfg.b.devaddr = address;
-  MODIFY_REG32( &core_regs.dev_regs->dev_cfg, 0, dcfg.d32);
-}
-
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_GetInEP
-* Description    : This function returns pointer to IN EP struct with number ep_num
-* Input          : Endpoint Number.
-* Output         : None
-* Return         : status
-*******************************************************************************/
-USB_OTG_EP* OTGD_FS_PCD_GetInEP(uint32_t ep_num)
-{
-  uint32_t i = 0;
-  
-  if (ep_num == 0)
-  {
-    return &USB_OTG_PCD_dev.ep0;
-  }
-  else
-  {
-    for (i = 0; i < MAX_TX_FIFOS; ++i)
-    {
-      if (USB_OTG_PCD_dev.in_ep[i].num == ep_num)
-        return &USB_OTG_PCD_dev.in_ep[i];
-    }
-    return 0;
-  }
-}
-/*******************************************************************************
-* Function Name  : USBF_GetOutEP
-* Description    : returns pointer to OUT EP struct with number ep_num
-* Input          : Endpoint Number.
-* Output         : None
-* Return         : USBF_EP
-*******************************************************************************/
-USB_OTG_EP* OTGD_FS_PCD_GetOutEP(uint32_t ep_num)
-{
-  uint32_t i = 0;
-  
-  if (ep_num == 0)
-  {
-    return &USB_OTG_PCD_dev.ep0;
-  }
-  else
-  {
-    for (i = 0; i < MAX_TX_FIFOS; ++i)
-    {
-      if (USB_OTG_PCD_dev.out_ep[i].num == ep_num)
-        return &USB_OTG_PCD_dev.out_ep[i];
-    }
-    return 0;
-  }
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_DevConnect
-* Description    : Connect device
-* Input         : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-void  OTGD_FS_PCD_DevConnect(void)
-{
-
-  USB_OTG_dev_ctl_data dctl;
-  
-  dctl.d32 = 0;
-
-  dctl.d32 = READ_REG32(&core_regs.dev_regs->dev_ctl);
-
-  /* Connect device */
-  dctl.b.sftdiscon  = 0;
-  WRITE_REG32(&core_regs.dev_regs->dev_ctl, dctl.d32);
-  mDELAY(25);
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_DevDisconnect
-* Description    : Disconnect device
-* Input         : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-void  OTGD_FS_PCD_DevDisconnect (void)
-{
-
-  USB_OTG_dev_ctl_data dctl;
-
-  dctl.d32 = 0;
-  
-  dctl.d32 = READ_REG32(&core_regs.dev_regs->dev_ctl);
-
-  /* Disconnect device for 20ms */
-  dctl.b.sftdiscon  = 1;
-  WRITE_REG32(&core_regs.dev_regs->dev_ctl, dctl.d32);
-  mDELAY(25);
-}
-
-/*******************************************************************************
-* Function Name  : OTGD_FS_PCD_EP0_OutStart
-* Description    : Configures EPO to receive SETUP packets.
-* Input          : None
-* Output         : None
-* Return         : None
-*******************************************************************************/
-void OTGD_FS_PCD_EP0_OutStart(void)
-{
-
-  USB_OTG_dev_ep_txfer_size0_data doeptsize0;
-  doeptsize0.d32 = 0;
-  
-  
-  doeptsize0.b.supcnt = 3;
-  doeptsize0.b.pktcnt = 1;
-  doeptsize0.b.xfersize = 8 * 3;
-
-  WRITE_REG32( &core_regs.outep_regs[0]->dev_out_ep_txfer_siz, doeptsize0.d32 );
-
-}
-
-#endif /* STM32F10X_CL */
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
-

STM32_USB-FS-Device_Driver/src/usb_init.c

@@ -1,63 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_init.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Initialization routines & global variables
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/*  The number of current endpoint, it will be used to specify an endpoint */
- uint8_t	EPindex;
-/*  The number of current device, it is an index to the Device_Table */
-/* uint8_t	Device_no; */
-/*  Points to the DEVICE_INFO structure of current device */
-/*  The purpose of this register is to speed up the execution */
-DEVICE_INFO *pInformation;
-/*  Points to the DEVICE_PROP structure of current device */
-/*  The purpose of this register is to speed up the execution */
-const DEVICE_PROP *pProperty;
-/*  Temporary save the state of Rx & Tx status. */
-/*  Whenever the Rx or Tx state is changed, its value is saved */
-/*  in this variable first and will be set to the EPRB or EPRA */
-/*  at the end of interrupt process */
-uint16_t	SaveState ;
-uint16_t  wInterrupt_Mask;
-DEVICE_INFO	Device_Info;
-const USER_STANDARD_REQUESTS  *pUser_Standard_Requests;
-
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : USB_Init
-* Description    : USB system initialization
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void USB_Init(void)
-{
-  pInformation = &Device_Info;
-  pInformation->ControlState = 2;
-  pProperty = &Device_Property;
-  pUser_Standard_Requests = &User_Standard_Requests;
-  /* Initialize devices one by one */
-  pProperty->Init();
-}
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/src/usb_int.c

@@ -1,188 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_int.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Endpoint CTR (Low and High) interrupt's service routines
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-#ifndef STM32F10X_CL
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-__IO uint16_t SaveRState;
-__IO uint16_t SaveTState;
-
-/* Extern variables ----------------------------------------------------------*/
-extern void (*pEpInt_IN[7])(void);    /*  Handles IN  interrupts   */
-extern void (*pEpInt_OUT[7])(void);   /*  Handles OUT interrupts   */
-
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : CTR_LP.
-* Description    : Low priority Endpoint Correct Transfer interrupt's service
-*                  routine.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void CTR_LP(void)
-{
-  __IO uint16_t wEPVal = 0;
-  /* stay in loop while pending ints */
-  while (((wIstr = _GetISTR()) & ISTR_CTR) != 0)
-  {
-    /* extract highest priority endpoint number */
-    EPindex = (uint8_t)(wIstr & ISTR_EP_ID);
-    if (EPindex == 0)
-    {
-      /* Decode and service control endpoint interrupt */
-      /* calling related service routine */
-      /* (Setup0_Process, In0_Process, Out0_Process) */
-
-      /* save RX & TX status */
-      /* and set both to NAK */
-
-
-	    SaveRState = _GetENDPOINT(ENDP0);
-	    SaveTState = SaveRState & EPTX_STAT;
-	    SaveRState &=  EPRX_STAT;	
-
-	    _SetEPRxTxStatus(ENDP0,EP_RX_NAK,EP_TX_NAK);
-
-      /* DIR bit = origin of the interrupt */
-
-      if ((wIstr & ISTR_DIR) == 0)
-      {
-        /* DIR = 0 */
-
-        /* DIR = 0      => IN  int */
-        /* DIR = 0 implies that (EP_CTR_TX = 1) always  */
-
-
-        _ClearEP_CTR_TX(ENDP0);
-        In0_Process();
-
-           /* before terminate set Tx & Rx status */
-
-            _SetEPRxTxStatus(ENDP0,SaveRState,SaveTState);
-		  return;
-      }
-      else
-      {
-        /* DIR = 1 */
-
-        /* DIR = 1 & CTR_RX       => SETUP or OUT int */
-        /* DIR = 1 & (CTR_TX | CTR_RX) => 2 int pending */
-
-        wEPVal = _GetENDPOINT(ENDP0);
-        
-        if ((wEPVal &EP_SETUP) != 0)
-        {
-          _ClearEP_CTR_RX(ENDP0); /* SETUP bit kept frozen while CTR_RX = 1 */
-          Setup0_Process();
-          /* before terminate set Tx & Rx status */
-
-		      _SetEPRxTxStatus(ENDP0,SaveRState,SaveTState);
-          return;
-        }
-
-        else if ((wEPVal & EP_CTR_RX) != 0)
-        {
-          _ClearEP_CTR_RX(ENDP0);
-          Out0_Process();
-          /* before terminate set Tx & Rx status */
-     
-		     _SetEPRxTxStatus(ENDP0,SaveRState,SaveTState);
-          return;
-        }
-      }
-    }/* if(EPindex == 0) */
-    else
-    {
-      /* Decode and service non control endpoints interrupt  */
-
-      /* process related endpoint register */
-      wEPVal = _GetENDPOINT(EPindex);
-      if ((wEPVal & EP_CTR_RX) != 0)
-      {
-        /* clear int flag */
-        _ClearEP_CTR_RX(EPindex);
-
-        /* call OUT service function */
-        (*pEpInt_OUT[EPindex-1])();
-
-      } /* if((wEPVal & EP_CTR_RX) */
-
-      if ((wEPVal & EP_CTR_TX) != 0)
-      {
-        /* clear int flag */
-        _ClearEP_CTR_TX(EPindex);
-
-        /* call IN service function */
-        (*pEpInt_IN[EPindex-1])();
-      } /* if((wEPVal & EP_CTR_TX) != 0) */
-
-    }/* if(EPindex == 0) else */
-
-  }/* while(...) */
-}
-
-/*******************************************************************************
-* Function Name  : CTR_HP.
-* Description    : High Priority Endpoint Correct Transfer interrupt's service 
-*                  routine.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void CTR_HP(void)
-{
-  uint32_t wEPVal = 0;
-
-  while (((wIstr = _GetISTR()) & ISTR_CTR) != 0)
-  {
-    _SetISTR((uint16_t)CLR_CTR); /* clear CTR flag */
-    /* extract highest priority endpoint number */
-    EPindex = (uint8_t)(wIstr & ISTR_EP_ID);
-    /* process related endpoint register */
-    wEPVal = _GetENDPOINT(EPindex);
-    if ((wEPVal & EP_CTR_RX) != 0)
-    {
-      /* clear int flag */
-      _ClearEP_CTR_RX(EPindex);
-
-      /* call OUT service function */
-      (*pEpInt_OUT[EPindex-1])();
-
-    } /* if((wEPVal & EP_CTR_RX) */
-    else if ((wEPVal & EP_CTR_TX) != 0)
-    {
-      /* clear int flag */
-      _ClearEP_CTR_TX(EPindex);
-
-      /* call IN service function */
-      (*pEpInt_IN[EPindex-1])();
-
-
-    } /* if((wEPVal & EP_CTR_TX) != 0) */
-
-  }/* while(...) */
-}
-
-#endif  /* STM32F10X_CL */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/src/usb_mem.c

@@ -1,75 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_mem.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Utility functions for memory transfers to/from PMA
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-#ifndef STM32F10X_CL
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-/*******************************************************************************
-* Function Name  : UserToPMABufferCopy
-* Description    : Copy a buffer from user memory area to packet memory area (PMA)
-* Input          : - pbUsrBuf: pointer to user memory area.
-*                  - wPMABufAddr: address into PMA.
-*                  - wNBytes: no. of bytes to be copied.
-* Output         : None.
-* Return         : None	.
-*******************************************************************************/
-void UserToPMABufferCopy(uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uint16_t wNBytes)
-{
-  uint32_t n = (wNBytes + 1) >> 1;   /* n = (wNBytes + 1) / 2 */
-  uint32_t i, temp1, temp2;
-  uint16_t *pdwVal;
-  pdwVal = (uint16_t *)(wPMABufAddr * 2 + PMAAddr);
-  for (i = n; i != 0; i--)
-  {
-    temp1 = (uint16_t) * pbUsrBuf;
-    pbUsrBuf++;
-    temp2 = temp1 | (uint16_t) * pbUsrBuf << 8;
-    *pdwVal++ = temp2;
-    pdwVal++;
-    pbUsrBuf++;
-  }
-}
-/*******************************************************************************
-* Function Name  : PMAToUserBufferCopy
-* Description    : Copy a buffer from user memory area to packet memory area (PMA)
-* Input          : - pbUsrBuf    = pointer to user memory area.
-*                  - wPMABufAddr = address into PMA.
-*                  - wNBytes     = no. of bytes to be copied.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void PMAToUserBufferCopy(uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uint16_t wNBytes)
-{
-  uint32_t n = (wNBytes + 1) >> 1;/* /2*/
-  uint32_t i;
-  uint32_t *pdwVal;
-  pdwVal = (uint32_t *)(wPMABufAddr * 2 + PMAAddr);
-  for (i = n; i != 0; i--)
-  {
-    *(uint16_t*)pbUsrBuf++ = *pdwVal++;
-    pbUsrBuf++;
-  }
-}
-
-#endif /* STM32F10X_CL */
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/src/usb_regs.c

@@ -1,750 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_regs.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Interface functions to USB cell registers
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-#ifndef STM32F10X_CL
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : SetCNTR.
-* Description    : Set the CNTR register value.
-* Input          : wRegValue: new register value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetCNTR(uint16_t wRegValue)
-{
-  _SetCNTR(wRegValue);
-}
-
-/*******************************************************************************
-* Function Name  : GetCNTR.
-* Description    : returns the CNTR register value.
-* Input          : None.
-* Output         : None.
-* Return         : CNTR register Value.
-*******************************************************************************/
-uint16_t GetCNTR(void)
-{
-  return(_GetCNTR());
-}
-
-/*******************************************************************************
-* Function Name  : SetISTR.
-* Description    : Set the ISTR register value.
-* Input          : wRegValue: new register value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetISTR(uint16_t wRegValue)
-{
-  _SetISTR(wRegValue);
-}
-
-/*******************************************************************************
-* Function Name  : GetISTR
-* Description    : Returns the ISTR register value.
-* Input          : None.
-* Output         : None.
-* Return         : ISTR register Value
-*******************************************************************************/
-uint16_t GetISTR(void)
-{
-  return(_GetISTR());
-}
-
-/*******************************************************************************
-* Function Name  : GetFNR
-* Description    : Returns the FNR register value.
-* Input          : None.
-* Output         : None.
-* Return         : FNR register Value
-*******************************************************************************/
-uint16_t GetFNR(void)
-{
-  return(_GetFNR());
-}
-
-/*******************************************************************************
-* Function Name  : SetDADDR
-* Description    : Set the DADDR register value.
-* Input          : wRegValue: new register value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetDADDR(uint16_t wRegValue)
-{
-  _SetDADDR(wRegValue);
-}
-
-/*******************************************************************************
-* Function Name  : GetDADDR
-* Description    : Returns the DADDR register value.
-* Input          : None.
-* Output         : None.
-* Return         : DADDR register Value
-*******************************************************************************/
-uint16_t GetDADDR(void)
-{
-  return(_GetDADDR());
-}
-
-/*******************************************************************************
-* Function Name  : SetBTABLE
-* Description    : Set the BTABLE.
-* Input          : wRegValue: New register value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetBTABLE(uint16_t wRegValue)
-{
-  _SetBTABLE(wRegValue);
-}
-
-/*******************************************************************************
-* Function Name  : GetBTABLE.
-* Description    : Returns the BTABLE register value.
-* Input          : None. 
-* Output         : None.
-* Return         : BTABLE address.
-*******************************************************************************/
-uint16_t GetBTABLE(void)
-{
-  return(_GetBTABLE());
-}
-
-/*******************************************************************************
-* Function Name  : SetENDPOINT
-* Description    : Setthe Endpoint register value.
-* Input          : bEpNum: Endpoint Number. 
-*                  wRegValue.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetENDPOINT(uint8_t bEpNum, uint16_t wRegValue)
-{
-  _SetENDPOINT(bEpNum, wRegValue);
-}
-
-/*******************************************************************************
-* Function Name  : GetENDPOINT
-* Description    : Return the Endpoint register value.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint register value.
-*******************************************************************************/
-uint16_t GetENDPOINT(uint8_t bEpNum)
-{
-  return(_GetENDPOINT(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : SetEPType
-* Description    : sets the type in the endpoint register.
-* Input          : bEpNum: Endpoint Number. 
-*                  wType: type definition.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPType(uint8_t bEpNum, uint16_t wType)
-{
-  _SetEPType(bEpNum, wType);
-}
-
-/*******************************************************************************
-* Function Name  : GetEPType
-* Description    : Returns the endpoint type.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint Type
-*******************************************************************************/
-uint16_t GetEPType(uint8_t bEpNum)
-{
-  return(_GetEPType(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : SetEPTxStatus
-* Description    : Set the status of Tx endpoint.
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPTxStatus(uint8_t bEpNum, uint16_t wState)
-{
-  _SetEPTxStatus(bEpNum, wState);
-}
-
-/*******************************************************************************
-* Function Name  : SetEPRxStatus
-* Description    : Set the status of Rx endpoint.
-* Input          : bEpNum: Endpoint Number. 
-*                  wState: new state.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPRxStatus(uint8_t bEpNum, uint16_t wState)
-{
-  _SetEPRxStatus(bEpNum, wState);
-}
-
-/*******************************************************************************
-* Function Name  : SetDouBleBuffEPStall
-* Description    : sets the status for Double Buffer Endpoint to STALL
-* Input          : bEpNum: Endpoint Number. 
-*                  bDir: Endpoint direction.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetDouBleBuffEPStall(uint8_t bEpNum, uint8_t bDir)
-{
-  uint16_t Endpoint_DTOG_Status;
-  Endpoint_DTOG_Status = GetENDPOINT(bEpNum);
-  if (bDir == EP_DBUF_OUT)
-  { /* OUT double buffered endpoint */
-    _SetENDPOINT(bEpNum, Endpoint_DTOG_Status & ~EPRX_DTOG1);
-  }
-  else if (bDir == EP_DBUF_IN)
-  { /* IN double buffered endpoint */
-    _SetENDPOINT(bEpNum, Endpoint_DTOG_Status & ~EPTX_DTOG1);
-  }
-}
-
-/*******************************************************************************
-* Function Name  : GetEPTxStatus
-* Description    : Returns the endpoint Tx status.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint TX Status
-*******************************************************************************/
-uint16_t GetEPTxStatus(uint8_t bEpNum)
-{
-  return(_GetEPTxStatus(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : GetEPRxStatus
-* Description    : Returns the endpoint Rx status.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint RX Status
-*******************************************************************************/
-uint16_t GetEPRxStatus(uint8_t bEpNum)
-{
-  return(_GetEPRxStatus(bEpNum));
-}
-
-/*******************************************************************************
-* Function Name  : SetEPTxValid
-* Description    : Valid the endpoint Tx Status.
-* Input          : bEpNum: Endpoint Number.  
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPTxValid(uint8_t bEpNum)
-{
-  _SetEPTxStatus(bEpNum, EP_TX_VALID);
-}
-
-/*******************************************************************************
-* Function Name  : SetEPRxValid
-* Description    : Valid the endpoint Rx Status.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPRxValid(uint8_t bEpNum)
-{
-  _SetEPRxStatus(bEpNum, EP_RX_VALID);
-}
-
-/*******************************************************************************
-* Function Name  : SetEP_KIND
-* Description    : Clear the EP_KIND bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEP_KIND(uint8_t bEpNum)
-{
-  _SetEP_KIND(bEpNum);
-}
-
-/*******************************************************************************
-* Function Name  : ClearEP_KIND
-* Description    : set the  EP_KIND bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ClearEP_KIND(uint8_t bEpNum)
-{
-  _ClearEP_KIND(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : Clear_Status_Out
-* Description    : Clear the Status Out of the related Endpoint
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Clear_Status_Out(uint8_t bEpNum)
-{
-  _ClearEP_KIND(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : Set_Status_Out
-* Description    : Set the Status Out of the related Endpoint
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Set_Status_Out(uint8_t bEpNum)
-{
-  _SetEP_KIND(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : SetEPDoubleBuff
-* Description    : Enable the double buffer feature for the endpoint. 
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPDoubleBuff(uint8_t bEpNum)
-{
-  _SetEP_KIND(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : ClearEPDoubleBuff
-* Description    : Disable the double buffer feature for the endpoint. 
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ClearEPDoubleBuff(uint8_t bEpNum)
-{
-  _ClearEP_KIND(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : GetTxStallStatus
-* Description    : Returns the Stall status of the Tx endpoint.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Tx Stall status.
-*******************************************************************************/
-uint16_t GetTxStallStatus(uint8_t bEpNum)
-{
-  return(_GetTxStallStatus(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : GetRxStallStatus
-* Description    : Returns the Stall status of the Rx endpoint. 
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Rx Stall status.
-*******************************************************************************/
-uint16_t GetRxStallStatus(uint8_t bEpNum)
-{
-  return(_GetRxStallStatus(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : ClearEP_CTR_RX
-* Description    : Clear the CTR_RX bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ClearEP_CTR_RX(uint8_t bEpNum)
-{
-  _ClearEP_CTR_RX(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : ClearEP_CTR_TX
-* Description    : Clear the CTR_TX bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ClearEP_CTR_TX(uint8_t bEpNum)
-{
-  _ClearEP_CTR_TX(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : ToggleDTOG_RX
-* Description    : Toggle the DTOG_RX bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ToggleDTOG_RX(uint8_t bEpNum)
-{
-  _ToggleDTOG_RX(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : ToggleDTOG_TX
-* Description    : Toggle the DTOG_TX bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ToggleDTOG_TX(uint8_t bEpNum)
-{
-  _ToggleDTOG_TX(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : ClearDTOG_RX.
-* Description    : Clear the DTOG_RX bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ClearDTOG_RX(uint8_t bEpNum)
-{
-  _ClearDTOG_RX(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : ClearDTOG_TX.
-* Description    : Clear the DTOG_TX bit.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void ClearDTOG_TX(uint8_t bEpNum)
-{
-  _ClearDTOG_TX(bEpNum);
-}
-/*******************************************************************************
-* Function Name  : SetEPAddress
-* Description    : Set the endpoint address.
-* Input          : bEpNum: Endpoint Number.
-*                  bAddr: New endpoint address.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPAddress(uint8_t bEpNum, uint8_t bAddr)
-{
-  _SetEPAddress(bEpNum, bAddr);
-}
-/*******************************************************************************
-* Function Name  : GetEPAddress
-* Description    : Get the endpoint address.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Endpoint address.
-*******************************************************************************/
-uint8_t GetEPAddress(uint8_t bEpNum)
-{
-  return(_GetEPAddress(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : SetEPTxAddr
-* Description    : Set the endpoint Tx buffer address.
-* Input          : bEpNum: Endpoint Number.
-*                  wAddr: new address. 
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPTxAddr(uint8_t bEpNum, uint16_t wAddr)
-{
-  _SetEPTxAddr(bEpNum, wAddr);
-}
-/*******************************************************************************
-* Function Name  : SetEPRxAddr
-* Description    : Set the endpoint Rx buffer address.
-* Input          : bEpNum: Endpoint Number.
-*                  wAddr: new address.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPRxAddr(uint8_t bEpNum, uint16_t wAddr)
-{
-  _SetEPRxAddr(bEpNum, wAddr);
-}
-/*******************************************************************************
-* Function Name  : GetEPTxAddr
-* Description    : Returns the endpoint Tx buffer address.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Rx buffer address. 
-*******************************************************************************/
-uint16_t GetEPTxAddr(uint8_t bEpNum)
-{
-  return(_GetEPTxAddr(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : GetEPRxAddr.
-* Description    : Returns the endpoint Rx buffer address.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Rx buffer address.
-*******************************************************************************/
-uint16_t GetEPRxAddr(uint8_t bEpNum)
-{
-  return(_GetEPRxAddr(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : SetEPTxCount.
-* Description    : Set the Tx count.
-* Input          : bEpNum: Endpoint Number.
-*                  wCount: new count value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPTxCount(uint8_t bEpNum, uint16_t wCount)
-{
-  _SetEPTxCount(bEpNum, wCount);
-}
-/*******************************************************************************
-* Function Name  : SetEPCountRxReg.
-* Description    : Set the Count Rx Register value.
-* Input          : *pdwReg: point to the register.
-*                  wCount: the new register value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPCountRxReg(uint32_t *pdwReg, uint16_t wCount)
-{
-  _SetEPCountRxReg(dwReg, wCount);
-}
-/*******************************************************************************
-* Function Name  : SetEPRxCount
-* Description    : Set the Rx count.
-* Input          : bEpNum: Endpoint Number. 
-*                  wCount: the new count value.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPRxCount(uint8_t bEpNum, uint16_t wCount)
-{
-  _SetEPRxCount(bEpNum, wCount);
-}
-/*******************************************************************************
-* Function Name  : GetEPTxCount
-* Description    : Get the Tx count.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None
-* Return         : Tx count value.
-*******************************************************************************/
-uint16_t GetEPTxCount(uint8_t bEpNum)
-{
-  return(_GetEPTxCount(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : GetEPRxCount
-* Description    : Get the Rx count.
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : Rx count value.
-*******************************************************************************/
-uint16_t GetEPRxCount(uint8_t bEpNum)
-{
-  return(_GetEPRxCount(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : SetEPDblBuffAddr
-* Description    : Set the addresses of the buffer 0 and 1.
-* Input          : bEpNum: Endpoint Number.  
-*                  wBuf0Addr: new address of buffer 0. 
-*                  wBuf1Addr: new address of buffer 1.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPDblBuffAddr(uint8_t bEpNum, uint16_t wBuf0Addr, uint16_t wBuf1Addr)
-{
-  _SetEPDblBuffAddr(bEpNum, wBuf0Addr, wBuf1Addr);
-}
-/*******************************************************************************
-* Function Name  : SetEPDblBuf0Addr
-* Description    : Set the Buffer 1 address.
-* Input          : bEpNum: Endpoint Number
-*                  wBuf0Addr: new address.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPDblBuf0Addr(uint8_t bEpNum, uint16_t wBuf0Addr)
-{
-  _SetEPDblBuf0Addr(bEpNum, wBuf0Addr);
-}
-/*******************************************************************************
-* Function Name  : SetEPDblBuf1Addr
-* Description    : Set the Buffer 1 address.
-* Input          : bEpNum: Endpoint Number
-*                  wBuf1Addr: new address.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPDblBuf1Addr(uint8_t bEpNum, uint16_t wBuf1Addr)
-{
-  _SetEPDblBuf1Addr(bEpNum, wBuf1Addr);
-}
-/*******************************************************************************
-* Function Name  : GetEPDblBuf0Addr
-* Description    : Returns the address of the Buffer 0.
-* Input          : bEpNum: Endpoint Number.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-uint16_t GetEPDblBuf0Addr(uint8_t bEpNum)
-{
-  return(_GetEPDblBuf0Addr(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : GetEPDblBuf1Addr
-* Description    : Returns the address of the Buffer 1.
-* Input          : bEpNum: Endpoint Number.
-* Output         : None.
-* Return         : Address of the Buffer 1.
-*******************************************************************************/
-uint16_t GetEPDblBuf1Addr(uint8_t bEpNum)
-{
-  return(_GetEPDblBuf1Addr(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : SetEPDblBuffCount
-* Description    : Set the number of bytes for a double Buffer 
-*                  endpoint.
-* Input          : bEpNum,bDir, wCount
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPDblBuffCount(uint8_t bEpNum, uint8_t bDir, uint16_t wCount)
-{
-  _SetEPDblBuffCount(bEpNum, bDir, wCount);
-}
-/*******************************************************************************
-* Function Name  : SetEPDblBuf0Count
-* Description    : Set the number of bytes in the buffer 0 of a double Buffer 
-*                  endpoint.
-* Input          : bEpNum, bDir,  wCount
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPDblBuf0Count(uint8_t bEpNum, uint8_t bDir, uint16_t wCount)
-{
-  _SetEPDblBuf0Count(bEpNum, bDir, wCount);
-}
-/*******************************************************************************
-* Function Name  : SetEPDblBuf1Count
-* Description    : Set the number of bytes in the buffer 0 of a double Buffer 
-*                  endpoint.
-* Input          : bEpNum,  bDir,  wCount
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void SetEPDblBuf1Count(uint8_t bEpNum, uint8_t bDir, uint16_t wCount)
-{
-  _SetEPDblBuf1Count(bEpNum, bDir, wCount);
-}
-/*******************************************************************************
-* Function Name  : GetEPDblBuf0Count
-* Description    : Returns the number of byte received in the buffer 0 of a double
-*                  Buffer endpoint.
-* Input          : bEpNum: Endpoint Number.
-* Output         : None.
-* Return         : Endpoint Buffer 0 count
-*******************************************************************************/
-uint16_t GetEPDblBuf0Count(uint8_t bEpNum)
-{
-  return(_GetEPDblBuf0Count(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : GetEPDblBuf1Count
-* Description    : Returns the number of data received in the buffer 1 of a double
-*                  Buffer endpoint.
-* Input          : bEpNum: Endpoint Number.
-* Output         : None.
-* Return         : Endpoint Buffer 1 count.
-*******************************************************************************/
-uint16_t GetEPDblBuf1Count(uint8_t bEpNum)
-{
-  return(_GetEPDblBuf1Count(bEpNum));
-}
-/*******************************************************************************
-* Function Name  : GetEPDblBufDir
-* Description    : gets direction of the double buffered endpoint
-* Input          : bEpNum: Endpoint Number. 
-* Output         : None.
-* Return         : EP_DBUF_OUT, EP_DBUF_IN,
-*                  EP_DBUF_ERR if the endpoint counter not yet programmed.
-*******************************************************************************/
-EP_DBUF_DIR GetEPDblBufDir(uint8_t bEpNum)
-{
-  if ((uint16_t)(*_pEPRxCount(bEpNum) & 0xFC00) != 0)
-    return(EP_DBUF_OUT);
-  else if (((uint16_t)(*_pEPTxCount(bEpNum)) & 0x03FF) != 0)
-    return(EP_DBUF_IN);
-  else
-    return(EP_DBUF_ERR);
-}
-/*******************************************************************************
-* Function Name  : FreeUserBuffer
-* Description    : free buffer used from the application realizing it to the line
-                   toggles bit SW_BUF in the double buffered endpoint register
-* Input          : bEpNum, bDir
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void FreeUserBuffer(uint8_t bEpNum, uint8_t bDir)
-{
-  if (bDir == EP_DBUF_OUT)
-  { /* OUT double buffered endpoint */
-    _ToggleDTOG_TX(bEpNum);
-  }
-  else if (bDir == EP_DBUF_IN)
-  { /* IN double buffered endpoint */
-    _ToggleDTOG_RX(bEpNum);
-  }
-}
-
-/*******************************************************************************
-* Function Name  : ToWord
-* Description    : merge two byte in a word.
-* Input          : bh: byte high, bl: bytes low.
-* Output         : None.
-* Return         : resulted word.
-*******************************************************************************/
-uint16_t ToWord(uint8_t bh, uint8_t bl)
-{
-  uint16_t wRet;
-  wRet = (uint16_t)bl | ((uint16_t)bh << 8);
-  return(wRet);
-}
-/*******************************************************************************
-* Function Name  : ByteSwap
-* Description    : Swap two byte in a word.
-* Input          : wSwW: word to Swap.
-* Output         : None.
-* Return         : resulted word.
-*******************************************************************************/
-uint16_t ByteSwap(uint16_t wSwW)
-{
-  uint8_t bTemp;
-  uint16_t wRet;
-  bTemp = (uint8_t)(wSwW & 0xff);
-  wRet =  (wSwW >> 8) | ((uint16_t)bTemp << 8);
-  return(wRet);
-}
-
-#endif /* STM32F10X_CL */
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

STM32_USB-FS-Device_Driver/src/usb_sil.c

@@ -1,126 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_sil.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Simplified Interface Layer for Global Initialization and 
-*                      Endpoint Rea/Write operations.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : USB_SIL_Init
-* Description    : Initialize the USB Device IP and the Endpoint 0.
-* Input          : None.
-* Output         : None.
-* Return         : Status.
-*******************************************************************************/
-uint32_t USB_SIL_Init(void)
-{
-#ifndef STM32F10X_CL
-  
-  /* USB interrupts initialization */
-  /* clear pending interrupts */
-  _SetISTR(0);
-  wInterrupt_Mask = IMR_MSK;
-  /* set interrupts mask */
-  _SetCNTR(wInterrupt_Mask);
-  
-#else
-  
-  /* Perform OTG Device initialization procedure (including EP0 init) */
-  OTG_DEV_Init();
-  
-#endif /* STM32F10X_CL */
-
-  return 0;
-}
-
-/*******************************************************************************
-* Function Name  : USB_SIL_Write
-* Description    : Write a buffer of data to a selected endpoint.
-* Input          : - bEpAddr: The address of the non control endpoint.
-*                  - pBufferPointer: The pointer to the buffer of data to be written
-*                    to the endpoint.
-*                  - wBufferSize: Number of data to be written (in bytes).
-* Output         : None.
-* Return         : Status.
-*******************************************************************************/
-uint32_t USB_SIL_Write(uint8_t bEpAddr, uint8_t* pBufferPointer, uint32_t wBufferSize)
-{
-#ifndef STM32F10X_CL
-
-  /* Use the memory interface function to write to the selected endpoint */
-  UserToPMABufferCopy(pBufferPointer, GetEPTxAddr(bEpAddr & 0x7F), wBufferSize);
-
-  /* Update the data length in the control register */
-  SetEPTxCount((bEpAddr & 0x7F), wBufferSize);
-  
-#else
-  
-   /* Use the PCD interface layer function to write to the selected endpoint */
-   OTGD_FS_PCD_EP_Write (bEpAddr, pBufferPointer, wBufferSize); 
-   
-#endif /* STM32F10X_CL */
-
-  return 0;
-}
-
-/*******************************************************************************
-* Function Name  : USB_SIL_Read
-* Description    : Write a buffer of data to a selected endpoint.
-* Input          : - bEpAddr: The address of the non control endpoint.
-*                  - pBufferPointer: The pointer to which will be saved the 
-*                     received data buffer.
-* Output         : None.
-* Return         : Number of received data (in Bytes).
-*******************************************************************************/
-uint32_t USB_SIL_Read(uint8_t bEpAddr, uint8_t* pBufferPointer)
-{
-  uint32_t DataLength = 0;
-
-#ifndef STM32F10X_CL
-
-  /* Get the number of received data on the selected Endpoint */
-  DataLength = GetEPRxCount(bEpAddr & 0x7F);
-  
-  /* Use the memory interface function to write to the selected endpoint */
-  PMAToUserBufferCopy(pBufferPointer, GetEPRxAddr(bEpAddr & 0x7F), DataLength);
-
-#else
-  
-  USB_OTG_EP *ep;
-
-  /* Get the structure pointer of the selected Endpoint */
-  ep = OTGD_FS_PCD_GetOutEP(bEpAddr);
-  
-  /* Get the number of received data */
-  DataLength = ep->xfer_len;
-  
-  /* Use the PCD interface layer function to read the selected endpoint */
-  OTGD_FS_PCD_EP_Read (bEpAddr, pBufferPointer, DataLength);
-  
-#endif /* STM32F10X_CL */
-
-  /* Return the number of received data */
-  return DataLength;
-}
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/hw_config.c

@@ -1,113 +0,0 @@
-/******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
-* File Name          : hw_config.c
-* Author             : MCD Application Team
-* Version            : V3.0.1
-* Date               : 04/27/2009
-* Description        : Hardware Configuration & Setup
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-#include "usb_prop.h"
-#include "usb_desc.h"
-#include "hw_config.h"
-#include "platform_config.h"
-#include "usb_pwr.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : Enter_LowPowerMode
-* Description    : Power-off system clocks and power while entering suspend mode
-* Input          : None.
-* Return         : None.
-*******************************************************************************/
-void Enter_LowPowerMode(void)
-{
-	/* Set the device state to suspend */
-	bDeviceState = SUSPENDED;
-}
-
-/*******************************************************************************
-* Function Name  : Leave_LowPowerMode
-* Description    : Restores system clocks and power while exiting suspend mode
-* Input          : None.
-* Return         : None.
-*******************************************************************************/
-void Leave_LowPowerMode(void)
-{
-	DEVICE_INFO *pInfo = &Device_Info;
-
-	/* Set the device state to the correct state */
-	if (pInfo->Current_Configuration != 0) {
-		/* Device configured */
-		bDeviceState = CONFIGURED;
-	} else {
-		bDeviceState = ATTACHED;
-	}
-}
-
-/*******************************************************************************
-* Function Name  : USB_Cable_Config
-* Description    : Software Connection/Disconnection of USB Cable
-* Input          : None.
-* Return         : Status
-*******************************************************************************/
-void USB_Cable_Config (FunctionalState NewState)
-{
-	if (NewState != DISABLE) {
-		GPIO_ResetBits(GPIOC, GPIO_Pin_11);
-	} else {
-		GPIO_SetBits(GPIOC, GPIO_Pin_11);
-	}
-}
-
-/*******************************************************************************
-* Function Name  : Get_SerialNum.
-* Description    : Create the serial number string descriptor.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Get_SerialNum(void)
-{
-	uint32_t Device_Serial0, Device_Serial1, Device_Serial2;
-/*
-  Device_Serial0 = *(__IO uint32_t*)(0x1FFFF7E8);
-  Device_Serial1 = *(__IO uint32_t*)(0x1FFFF7EC);
-  Device_Serial2 = *(__IO uint32_t*)(0x1FFFF7F0);
-
-  if (Device_Serial0 != 0)
-  {
-    Virtual_Com_Port_StringSerial[2] = (uint8_t)(Device_Serial0 & 0x000000FF);
-    Virtual_Com_Port_StringSerial[4] = (uint8_t)((Device_Serial0 & 0x0000FF00) >> 8);
-    Virtual_Com_Port_StringSerial[6] = (uint8_t)((Device_Serial0 & 0x00FF0000) >> 16);
-    Virtual_Com_Port_StringSerial[8] = (uint8_t)((Device_Serial0 & 0xFF000000) >> 24);
-
-    Virtual_Com_Port_StringSerial[10] = (uint8_t)(Device_Serial1 & 0x000000FF);
-    Virtual_Com_Port_StringSerial[12] = (uint8_t)((Device_Serial1 & 0x0000FF00) >> 8);
-    Virtual_Com_Port_StringSerial[14] = (uint8_t)((Device_Serial1 & 0x00FF0000) >> 16);
-    Virtual_Com_Port_StringSerial[16] = (uint8_t)((Device_Serial1 & 0xFF000000) >> 24);
-
-    Virtual_Com_Port_StringSerial[18] = (uint8_t)(Device_Serial2 & 0x000000FF);
-    Virtual_Com_Port_StringSerial[20] = (uint8_t)((Device_Serial2 & 0x0000FF00) >> 8);
-    Virtual_Com_Port_StringSerial[22] = (uint8_t)((Device_Serial2 & 0x00FF0000) >> 16);
-    Virtual_Com_Port_StringSerial[24] = (uint8_t)((Device_Serial2 & 0xFF000000) >> 24);
-  }*/
-}
-
-/******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/hw_config.h

@@ -1,41 +0,0 @@
-/******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
-* File Name          : hw_config.h
-* Author             : MCD Application Team
-* Version            : V3.0.1
-* Date               : 04/27/2009
-* Description        : Hardware Configuration & Setup
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __HW_CONFIG_H
-#define __HW_CONFIG_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_type.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported define -----------------------------------------------------------*/
-#define MASS_MEMORY_START     0x04002000
-#define BULK_MAX_PACKET_SIZE  0x00000040
-#define LED_ON                0xF0
-#define LED_OFF               0xFF
-
-/* Exported functions ------------------------------------------------------- */
-void Enter_LowPowerMode(void);
-void Leave_LowPowerMode(void);
-void USB_Cable_Config (FunctionalState NewState);
-void Get_SerialNum(void);
-
-/* External variables --------------------------------------------------------*/
-
-#endif  /*__HW_CONFIG_H*/
-/******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/platform.h

@@ -1,57 +0,0 @@
-#ifndef PLATFORM_H_
-#define PLATFORM_H_
-
-#define LED_PIN            GPIO_Pin_12
-#define LED_GPIO           GPIOC
-
-#define LCD_E_PIN          GPIO_Pin_10
-#define LCD_E_GPIO         GPIOC
-
-#define LCD_RESET_PIN      GPIO_Pin_7
-#define LCD_RESET_GPIO     GPIOC
-
-#define LCD_DC_PIN         GPIO_Pin_2
-#define LCD_DC_GPIO        GPIOB
-
-#define TAMP_PIN           GPIO_Pin_13
-#define TAMP_GPIO          GPIOC
-
-#define WAKE_PIN           GPIO_Pin_0
-#define WAKE_GPIO          GPIOA
-
-#define JOY_CENTER_PIN     GPIO_Pin_6
-#define JOY_CENTER_GPIO    GPIOC
-
-#define NRF_CS_PIN         GPIO_Pin_4
-#define NRF_CS_GPIO        GPIOA
-
-#define NRF_CE_PIN         GPIO_Pin_8
-#define NRF_CE_GPIO        GPIOC
-
-#define NRF_IRQ_PIN        GPIO_Pin_9
-#define NRF_IRQ_GPIO       GPIOC
-
-#define ADIS_CS_PIN        GPIO_Pin_10
-#define ADIS_CS_GPIO       GPIOB
-
-#define ADIS_RESET_PIN     GPIO_Pin_3
-#define ADIS_RESET_GPIO    GPIOA
-
-#define LED_WRITE(x)       GPIO_WriteBit(LED_GPIO, LED_PIN, x)
-
-#define LCD_DC_WRITE(x)    GPIO_WriteBit(LCD_DC_GPIO, LCD_DC_PIN, x)
-#define LCD_E_WRITE(x)     GPIO_WriteBit(LCD_E_GPIO, LCD_E_PIN, x)
-#define LCD_RESET_WRITE(x) GPIO_WriteBit(LCD_RESET_GPIO, LCD_RESET_PIN, x)
-
-#define TAMP_READ          GPIO_ReadInputDataBit(TAMP_GPIO, TAMP_PIN)
-#define WAKE_READ          GPIO_ReadInputDataBit(WAKE_GPIO, WAKE_PIN)
-#define JOY_CENTER_READ    GPIO_ReadInputDataBit(JOY_CENTER_GPIO, JOY_CENTER_PIN)
-
-#define NRF_CE_WRITE(x)    GPIO_WriteBit(NRF_CE_GPIO, NRF_CE_PIN, x)
-#define NRF_CS_WRITE(x)    GPIO_WriteBit(NRF_CS_GPIO, NRF_CS_PIN, x)
-#define NRF_IRQ_READ       GPIO_ReadInputDataBit(MRF_IRQ_GPIO, NRF_IRQ_PIN)
-
-#define ADIS_CS_WRITE(x)   GPIO_WriteBit(ADIS_CS_GPIO, ADIS_CS_PIN, x)
-#define ADIS_RESET_WRITE(x) GPIO_WriteBit(ADIS_RESET_GPIO, ADIS_RESET_PIN, x)
-#endif
-

Virtual_COM_Port/platform_config.h

@@ -1,52 +0,0 @@
-/******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
-* File Name          : platform_config.h
-* Author             : MCD Application Team
-* Version            : V3.0.1
-* Date               : 04/27/2009
-* Description        : Evaluation board specific configuration file.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __PLATFORM_CONFIG_H
-#define __PLATFORM_CONFIG_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Uncomment the line corresponding to the STMicroelectronics evaluation board
-   used to run the example */
-#if !defined (USE_STM3210B_EVAL) &&  !defined (USE_STM3210E_EVAL)
- //#define USE_STM3210B_EVAL
- #define USE_STM3210E_EVAL
-#endif
-
-/* Define the STM32F10x hardware depending on the used evaluation board */
-#ifdef USE_STM3210B_EVAL
-
-  #define USB_DISCONNECT            GPIOD  
-  #define USB_DISCONNECT_PIN        GPIO_Pin_9
-  #define RCC_APB2Periph_GPIO_DISCONNECT      RCC_APB2Periph_GPIOD
-
-#else /* USE_STM3210E_EVAL */
-
-  #define USB_DISCONNECT            GPIOB  
-  #define USB_DISCONNECT_PIN        GPIO_Pin_14
-  #define RCC_APB2Periph_GPIO_DISCONNECT      RCC_APB2Periph_GPIOB
-
-#endif /* USE_STM3210B_EVAL */
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#endif /* __PLATFORM_CONFIG_H */
-
-/******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/usb_conf.h

@@ -1,197 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_conf.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Virtual COM Port Demo configuration  header
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_CONF_H
-#define __USB_CONF_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-/* External variables --------------------------------------------------------*/
-
-/*-------------------------------------------------------------*/
-/* EP_NUM */
-/* defines how many endpoints are used by the device */
-/*-------------------------------------------------------------*/
-
-#define EP_NUM                          (4)
-
-
-#ifndef STM32F10X_CL
-/*-------------------------------------------------------------*/
-/* --------------   Buffer Description Table  -----------------*/
-/*-------------------------------------------------------------*/
-/* buffer table base address */
-/* buffer table base address */
-#define BTABLE_ADDRESS      (0x00)
-
-/* EP0  */
-/* rx/tx buffer base address */
-#define ENDP0_RXADDR        (0x40)
-#define ENDP0_TXADDR        (0x80)
-
-/* EP1  */
-/* tx buffer base address */
-#define ENDP1_TXADDR        (0xC0)
-#define ENDP2_TXADDR        (0x100)
-#define ENDP3_RXADDR        (0x110)
-
-
-/*-------------------------------------------------------------*/
-/* -------------------   ISTR events  -------------------------*/
-/*-------------------------------------------------------------*/
-/* IMR_MSK */
-/* mask defining which events has to be handled */
-/* by the device application software */
-#define IMR_MSK (CNTR_CTRM  | CNTR_SOFM  | CNTR_RESETM )
-
-/*#define CTR_CALLBACK*/
-/*#define DOVR_CALLBACK*/
-/*#define ERR_CALLBACK*/
-/*#define WKUP_CALLBACK*/
-/*#define SUSP_CALLBACK*/
-/*#define RESET_CALLBACK*/
-/*#define SOF_CALLBACK*/
-/*#define ESOF_CALLBACK*/
-#endif /* STM32F10X_CL */
-
-#ifdef STM32F10X_CL
-/*******************************************************************************
-*                              FIFO Size Configuration
-*  
-*  (i) Dedicated data FIFO SPRAM of 1.25 Kbytes = 1280 bytes = 320 32-bits words
-*      available for the endpoints IN and OUT.
-*      Device mode features:
-*      -1 bidirectional CTRL EP 0
-*      -3 IN EPs to support any kind of Bulk, Interrupt or Isochronous transfer
-*      -3 OUT EPs to support any kind of Bulk, Interrupt or Isochronous transfer
-*
-*  ii) Receive data FIFO size = RAM for setup packets + 
-*                   OUT endpoint control information +
-*                   data OUT packets + miscellaneous
-*      Space = ONE 32-bits words
-*     --> RAM for setup packets = 4 * n + 6 space
-*        (n is the nbr of CTRL EPs the device core supports) 
-*     --> OUT EP CTRL info      = 1 space
-*        (one space for status information written to the FIFO along with each 
-*        received packet)
-*     --> data OUT packets      = (Largest Packet Size / 4) + 1 spaces 
-*        (MINIMUM to receive packets)
-*     --> OR data OUT packets  = at least 2*(Largest Packet Size / 4) + 1 spaces 
-*        (if high-bandwidth EP is enabled or multiple isochronous EPs)
-*     --> miscellaneous = 1 space per OUT EP
-*        (one space for transfer complete status information also pushed to the 
-*        FIFO with each endpoint's last packet)
-*
-*  (iii)MINIMUM RAM space required for each IN EP Tx FIFO = MAX packet size for 
-*       that particular IN EP. More space allocated in the IN EP Tx FIFO results
-*       in a better performance on the USB and can hide latencies on the AHB.
-*
-*  (iv) TXn min size = 16 words. (n  : Transmit FIFO index)
-*   (v) When a TxFIFO is not used, the Configuration should be as follows: 
-*       case 1 :  n > m    and Txn is not used    (n,m  : Transmit FIFO indexes)
-*       --> Txm can use the space allocated for Txn.
-*       case2  :  n < m    and Txn is not used    (n,m  : Transmit FIFO indexes)
-*       --> Txn should be configured with the minimum space of 16 words
-*  (vi) The FIFO is used optimally when used TxFIFOs are allocated in the top 
-*       of the FIFO.Ex: use EP1 and EP2 as IN instead of EP1 and EP3 as IN ones.
-*******************************************************************************/
-
-#define RX_FIFO_SIZE                          128
-#define TX0_FIFO_SIZE                          64
-#define TX1_FIFO_SIZE                          64
-#define TX2_FIFO_SIZE                          16
-#define TX3_FIFO_SIZE                          16
-
-/* OTGD-FS-DEVICE IP interrupts Enable definitions */
-/* Uncomment the define to enable the selected interrupt */
-//#define INTR_MODEMISMATCH
-#define INTR_SOFINTR
-#define INTR_RXSTSQLVL           /* Mandatory */
-//#define INTR_NPTXFEMPTY
-//#define INTR_GINNAKEFF
-//#define INTR_GOUTNAKEFF
-//#define INTR_ERLYSUSPEND
-#define INTR_USBSUSPEND          /* Mandatory */
-#define INTR_USBRESET            /* Mandatory */
-#define INTR_ENUMDONE            /* Mandatory */
-//#define INTR_ISOOUTDROP
-//#define INTR_EOPFRAME
-//#define INTR_EPMISMATCH
-#define INTR_INEPINTR            /* Mandatory */
-#define INTR_OUTEPINTR           /* Mandatory */
-//#define INTR_INCOMPLISOIN
-//#define INTR_INCOMPLISOOUT
-#define INTR_WKUPINTR            /* Mandatory */
-
-/* OTGD-FS-DEVICE IP interrupts subroutines */
-/* Comment the define to enable the selected interrupt subroutine and replace it
-   by user code */
-#define  INTR_MODEMISMATCH_Callback      NOP_Process
-#define  INTR_SOFINTR_Callback           NOP_Process
-#define  INTR_RXSTSQLVL_Callback         NOP_Process
-#define  INTR_NPTXFEMPTY_Callback        NOP_Process
-#define  INTR_NPTXFEMPTY_Callback        NOP_Process
-#define  INTR_GINNAKEFF_Callback         NOP_Process
-#define  INTR_GOUTNAKEFF_Callback        NOP_Process
-#define  INTR_ERLYSUSPEND_Callback       NOP_Process
-#define  INTR_USBSUSPEND_Callback        NOP_Process
-#define  INTR_USBRESET_Callback          NOP_Process
-#define  INTR_ENUMDONE_Callback          NOP_Process
-#define  INTR_ISOOUTDROP_Callback        NOP_Process
-#define  INTR_EOPFRAME_Callback          NOP_Process
-#define  INTR_EPMISMATCH_Callback        NOP_Process
-#define  INTR_INEPINTR_Callback          NOP_Process
-#define  INTR_OUTEPINTR_Callback         NOP_Process
-#define  INTR_INCOMPLISOIN_Callback      NOP_Process
-#define  INTR_INCOMPLISOOUT_Callback     NOP_Process
-#define  INTR_WKUPINTR_Callback          NOP_Process
-
-/* Isochronous data update */
-#define  INTR_RXSTSQLVL_ISODU_Callback   NOP_Process  
-
-/* Isochronous transfer parameters */
-/* Size of a single Isochronous buffer (size of a single transfer) */
-#define ISOC_BUFFER_SZE                  1
-/* Number of sub-buffers (number of single buffers/transfers), should be even */
-#define NUM_SUB_BUFFERS                  2
-
-#endif /* STM32F10X_CL */
-
-
-/* CTR service routines */
-/* associated to defined endpoints */
-/*#define  EP1_IN_Callback   NOP_Process
-#define  EP2_IN_Callback   NOP_Process
-#define  EP3_IN_Callback   NOP_Process
-#define  EP4_IN_Callback   NOP_Process
-#define  EP5_IN_Callback   NOP_Process
-#define  EP6_IN_Callback   NOP_Process
-#define  EP7_IN_Callback   NOP_Process
-
-#define  EP1_OUT_Callback   NOP_Process
-#define  EP2_OUT_Callback   NOP_Process
-#define  EP3_OUT_Callback   NOP_Process
-#define  EP4_OUT_Callback   NOP_Process
-#define  EP5_OUT_Callback   NOP_Process
-#define  EP6_OUT_Callback   NOP_Process
-#define  EP7_OUT_Callback   NOP_Process*/
-
-#endif /* __USB_CONF_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/usb_desc.c

@@ -1,161 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_desc.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Descriptors for Virtual Com Port Demo
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-#include "usb_desc.h"
-
-/* USB Standard Device Descriptor */
-const uint8_t Virtual_Com_Port_DeviceDescriptor[] =
-  {
-    0x12,   /* bLength */
-    USB_DEVICE_DESCRIPTOR_TYPE,     /* bDescriptorType */
-    0x00,
-    0x02,   /* bcdUSB = 2.00 */
-    0x02,   /* bDeviceClass: CDC */
-    0x00,   /* bDeviceSubClass */
-    0x00,   /* bDeviceProtocol */
-    0x40,   /* bMaxPacketSize0 */
-    0x83,
-    0x04,   /* idVendor = 0x0483 */
-    0x40,
-    0x57,   /* idProduct = 0x7540 */
-    0x00,
-    0x02,   /* bcdDevice = 2.00 */
-    1,              /* Index of string descriptor describing manufacturer */
-    2,              /* Index of string descriptor describing product */
-    3,              /* Index of string descriptor describing the device's serial number */
-    0x01    /* bNumConfigurations */
-  };
-
-const uint8_t Virtual_Com_Port_ConfigDescriptor[] =
-  {
-    /*Configuation Descriptor*/
-    0x09,   /* bLength: Configuation Descriptor size */
-    USB_CONFIGURATION_DESCRIPTOR_TYPE,      /* bDescriptorType: Configuration */
-    VIRTUAL_COM_PORT_SIZ_CONFIG_DESC,       /* wTotalLength:no of returned bytes */
-    0x00,
-    0x02,   /* bNumInterfaces: 2 interface */
-    0x01,   /* bConfigurationValue: Configuration value */
-    0x00,   /* iConfiguration: Index of string descriptor describing the configuration */
-    0xC0,   /* bmAttributes: self powered */
-    0x32,   /* MaxPower 0 mA */
-    /*Interface Descriptor*/
-    0x09,   /* bLength: Interface Descriptor size */
-    USB_INTERFACE_DESCRIPTOR_TYPE,  /* bDescriptorType: Interface */
-    /* Interface descriptor type */
-    0x00,   /* bInterfaceNumber: Number of Interface */
-    0x00,   /* bAlternateSetting: Alternate setting */
-    0x01,   /* bNumEndpoints: One endpoints used */
-    0x02,   /* bInterfaceClass: Communication Interface Class */
-    0x02,   /* bInterfaceSubClass: Abstract Control Model */
-    0x01,   /* bInterfaceProtocol: Common AT commands */
-    0x00,   /* iInterface: */
-    /*Header Functional Descriptor*/
-    0x05,   /* bLength: Endpoint Descriptor size */
-    0x24,   /* bDescriptorType: CS_INTERFACE */
-    0x00,   /* bDescriptorSubtype: Header Func Desc */
-    0x10,   /* bcdCDC: spec release number */
-    0x01,
-    /*Call Managment Functional Descriptor*/
-    0x05,   /* bFunctionLength */
-    0x24,   /* bDescriptorType: CS_INTERFACE */
-    0x01,   /* bDescriptorSubtype: Call Management Func Desc */
-    0x00,   /* bmCapabilities: D0+D1 */
-    0x01,   /* bDataInterface: 1 */
-    /*ACM Functional Descriptor*/
-    0x04,   /* bFunctionLength */
-    0x24,   /* bDescriptorType: CS_INTERFACE */
-    0x02,   /* bDescriptorSubtype: Abstract Control Management desc */
-    0x02,   /* bmCapabilities */
-    /*Union Functional Descriptor*/
-    0x05,   /* bFunctionLength */
-    0x24,   /* bDescriptorType: CS_INTERFACE */
-    0x06,   /* bDescriptorSubtype: Union func desc */
-    0x00,   /* bMasterInterface: Communication class interface */
-    0x01,   /* bSlaveInterface0: Data Class Interface */
-    /*Endpoint 2 Descriptor*/
-    0x07,   /* bLength: Endpoint Descriptor size */
-    USB_ENDPOINT_DESCRIPTOR_TYPE,   /* bDescriptorType: Endpoint */
-    0x82,   /* bEndpointAddress: (IN2) */
-    0x03,   /* bmAttributes: Interrupt */
-    VIRTUAL_COM_PORT_INT_SIZE,      /* wMaxPacketSize: */
-    0x00,
-    0xFF,   /* bInterval: */
-    /*Data class interface descriptor*/
-    0x09,   /* bLength: Endpoint Descriptor size */
-    USB_INTERFACE_DESCRIPTOR_TYPE,  /* bDescriptorType: */
-    0x01,   /* bInterfaceNumber: Number of Interface */
-    0x00,   /* bAlternateSetting: Alternate setting */
-    0x02,   /* bNumEndpoints: Two endpoints used */
-    0x0A,   /* bInterfaceClass: CDC */
-    0x00,   /* bInterfaceSubClass: */
-    0x00,   /* bInterfaceProtocol: */
-    0x00,   /* iInterface: */
-    /*Endpoint 3 Descriptor*/
-    0x07,   /* bLength: Endpoint Descriptor size */
-    USB_ENDPOINT_DESCRIPTOR_TYPE,   /* bDescriptorType: Endpoint */
-    0x03,   /* bEndpointAddress: (OUT3) */
-    0x02,   /* bmAttributes: Bulk */
-    VIRTUAL_COM_PORT_DATA_SIZE,             /* wMaxPacketSize: */
-    0x00,
-    0x00,   /* bInterval: ignore for Bulk transfer */
-    /*Endpoint 1 Descriptor*/
-    0x07,   /* bLength: Endpoint Descriptor size */
-    USB_ENDPOINT_DESCRIPTOR_TYPE,   /* bDescriptorType: Endpoint */
-    0x81,   /* bEndpointAddress: (IN1) */
-    0x02,   /* bmAttributes: Bulk */
-    VIRTUAL_COM_PORT_DATA_SIZE,             /* wMaxPacketSize: */
-    0x00,
-    0x00    /* bInterval */
-  };
-
-/* USB String Descriptors */
-const uint8_t Virtual_Com_Port_StringLangID[VIRTUAL_COM_PORT_SIZ_STRING_LANGID] =
-  {
-    VIRTUAL_COM_PORT_SIZ_STRING_LANGID,
-    USB_STRING_DESCRIPTOR_TYPE,
-    0x09,
-    0x04 /* LangID = 0x0409: U.S. English */
-  };
-
-const uint8_t Virtual_Com_Port_StringVendor[VIRTUAL_COM_PORT_SIZ_STRING_VENDOR] =
-  {
-    VIRTUAL_COM_PORT_SIZ_STRING_VENDOR,     /* Size of Vendor string */
-    USB_STRING_DESCRIPTOR_TYPE,             /* bDescriptorType*/
-    /* Manufacturer: "STMicroelectronics" */
-    'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,
-    'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,
-    'c', 0, 's', 0
-  };
-
-const uint8_t Virtual_Com_Port_StringProduct[VIRTUAL_COM_PORT_SIZ_STRING_PRODUCT] =
-  {
-    VIRTUAL_COM_PORT_SIZ_STRING_PRODUCT,          /* bLength */
-    USB_STRING_DESCRIPTOR_TYPE,        /* bDescriptorType */
-    /* Product name: "STM32 Virtual COM Port" */
-    'S', 0, 'T', 0, 'M', 0, '3', 0, '2', 0, ' ', 0, 'V', 0, 'i', 0,
-    'r', 0, 't', 0, 'u', 0, 'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0,
-    'M', 0, ' ', 0, 'P', 0, 'o', 0, 'r', 0, 't', 0, ' ', 0, ' ', 0
-  };
-
-uint8_t Virtual_Com_Port_StringSerial[VIRTUAL_COM_PORT_SIZ_STRING_SERIAL] =
-  {
-    VIRTUAL_COM_PORT_SIZ_STRING_SERIAL,           /* bLength */
-    USB_STRING_DESCRIPTOR_TYPE,                   /* bDescriptorType */
-    'S', 0, 'T', 0, 'M', 0, '3', 0, '2', 0, '1', 0, '0', 0
-  };
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/usb_desc.h

@@ -1,53 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_desc.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Descriptor Header for Virtual COM Port Device
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_DESC_H
-#define __USB_DESC_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported define -----------------------------------------------------------*/
-#define USB_DEVICE_DESCRIPTOR_TYPE              0x01
-#define USB_CONFIGURATION_DESCRIPTOR_TYPE       0x02
-#define USB_STRING_DESCRIPTOR_TYPE              0x03
-#define USB_INTERFACE_DESCRIPTOR_TYPE           0x04
-#define USB_ENDPOINT_DESCRIPTOR_TYPE            0x05
-
-#define VIRTUAL_COM_PORT_DATA_SIZE              16
-#define VIRTUAL_COM_PORT_INT_SIZE               8
-
-#define VIRTUAL_COM_PORT_SIZ_DEVICE_DESC        18
-#define VIRTUAL_COM_PORT_SIZ_CONFIG_DESC        67
-#define VIRTUAL_COM_PORT_SIZ_STRING_LANGID      4
-#define VIRTUAL_COM_PORT_SIZ_STRING_VENDOR      38
-#define VIRTUAL_COM_PORT_SIZ_STRING_PRODUCT     50
-#define VIRTUAL_COM_PORT_SIZ_STRING_SERIAL      26
-
-#define STANDARD_ENDPOINT_DESC_SIZE             0x09
-
-/* Exported functions ------------------------------------------------------- */
-extern const uint8_t Virtual_Com_Port_DeviceDescriptor[VIRTUAL_COM_PORT_SIZ_DEVICE_DESC];
-extern const uint8_t Virtual_Com_Port_ConfigDescriptor[VIRTUAL_COM_PORT_SIZ_CONFIG_DESC];
-
-extern const uint8_t Virtual_Com_Port_StringLangID[VIRTUAL_COM_PORT_SIZ_STRING_LANGID];
-extern const uint8_t Virtual_Com_Port_StringVendor[VIRTUAL_COM_PORT_SIZ_STRING_VENDOR];
-extern const uint8_t Virtual_Com_Port_StringProduct[VIRTUAL_COM_PORT_SIZ_STRING_PRODUCT];
-extern uint8_t Virtual_Com_Port_StringSerial[VIRTUAL_COM_PORT_SIZ_STRING_SERIAL];
-
-#endif /* __USB_DESC_H */
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/usb_endp.c

@@ -1,67 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_endp.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Endpoint routines
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-#include "usb_desc.h"
-#include "usb_mem.h"
-#include "hw_config.h"
-#include "usb_istr.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-uint8_t buffer_out[VIRTUAL_COM_PORT_DATA_SIZE];
-uint8_t buffer_in[VIRTUAL_COM_PORT_DATA_SIZE];
-
-__IO uint32_t count_out = 0;
-uint32_t count_in = 0;
-
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : EP1_IN_Callback
-* Description    :
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void EP3_IN_Callback(void)
-{
-  count_in = 0;
-}
-
-/*******************************************************************************
-* Function Name  : EP3_IN_Callback
-* Description    :
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void EP5_OUT_Callback(void)
-{
-  /* Get the received data buffer and update the counter */
-  count_out = USB_SIL_Read(EP5_OUT, buffer_out);
-    
-#ifndef STM32F10X_CL
-  /* Enable the receive of data on EP3 */
-  SetEPRxValid(ENDP3);
-#endif /* STM32F10X_CL */
-}
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
-

Virtual_COM_Port/usb_istr.c

@@ -1,419 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_istr.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : ISTR events interrupt service routines
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-#include "usb_prop.h"
-#include "usb_pwr.h"
-#include "usb_istr.h"
-
-/* function prototypes Automatically built defining related macros */
-void NOP_Proc(void) {
-}
-
-#define WEAK __attribute__ ((weak))
-void WEAK EP1_IN_Callback(void);
-void WEAK EP2_IN_Callback(void);
-void WEAK EP3_IN_Callback(void);
-void WEAK EP4_IN_Callback(void);
-void WEAK EP5_IN_Callback(void);
-void WEAK EP6_IN_Callback(void);
-void WEAK EP7_IN_Callback(void);
-
-void WEAK EP1_OUT_Callback(void);
-void WEAK EP2_OUT_Callback(void);
-void WEAK EP3_OUT_Callback(void);
-void WEAK EP4_OUT_Callback(void);
-void WEAK EP5_OUT_Callback(void);
-void WEAK EP6_OUT_Callback(void);
-void WEAK EP7_OUT_Callback(void);
-
-#pragma weak EP1_IN_Callback = NOP_Proc
-#pragma weak EP2_IN_Callback = NOP_Proc
-#pragma weak EP3_IN_Callback = NOP_Proc
-#pragma weak EP4_IN_Callback = NOP_Proc
-#pragma weak EP5_IN_Callback = NOP_Proc
-#pragma weak EP6_IN_Callback = NOP_Proc
-#pragma weak EP7_IN_Callback = NOP_Proc
-
-#pragma weak EP1_OUT_Callback = NOP_Proc
-#pragma weak EP2_OUT_Callback = NOP_Proc
-#pragma weak EP3_OUT_Callback = NOP_Proc
-#pragma weak EP4_OUT_Callback = NOP_Proc
-#pragma weak EP5_OUT_Callback = NOP_Proc
-#pragma weak EP6_OUT_Callback = NOP_Proc
-#pragma weak EP7_OUT_Callback = NOP_Proc
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-__IO uint16_t wIstr;  /* ISTR register last read value */
-__IO uint8_t bIntPackSOF = 0;  /* SOFs received between 2 consecutive packets */
-
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-/* function pointers to non-control endpoints service routines */
-void (*const pEpInt_IN[7])(void) =
-  {
-    EP1_IN_Callback,
-    EP2_IN_Callback,
-    EP3_IN_Callback,
-    EP4_IN_Callback,
-    EP5_IN_Callback,
-    EP6_IN_Callback,
-    EP7_IN_Callback,
-  };
-
-void (*const pEpInt_OUT[7])(void) =
-  {
-    EP1_OUT_Callback,
-    EP2_OUT_Callback,
-    EP3_OUT_Callback,
-    EP4_OUT_Callback,
-    EP5_OUT_Callback,
-    EP6_OUT_Callback,
-    EP7_OUT_Callback,
-  };
-
-#ifndef STM32F10X_CL
-
-/*******************************************************************************
-* Function Name  : USB_Istr
-* Description    : STR events interrupt service routine
-* Input          :
-* Output         :
-* Return         :
-*******************************************************************************/
-void USB_Istr(void)
-{
-
-  wIstr = _GetISTR();
-
-#if (IMR_MSK & ISTR_CTR)
-  if (wIstr & ISTR_CTR & wInterrupt_Mask)
-  {
-    /* servicing of the endpoint correct transfer interrupt */
-    /* clear of the CTR flag into the sub */
-    CTR_LP();
-#ifdef CTR_CALLBACK
-    CTR_Callback();
-#endif
-  }
-#endif
-  /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/  
-#if (IMR_MSK & ISTR_RESET)
-  if (wIstr & ISTR_RESET & wInterrupt_Mask)
-  {
-    _SetISTR((uint16_t)CLR_RESET);
-    Device_Property.Reset();
-#ifdef RESET_CALLBACK
-    RESET_Callback();
-#endif
-  }
-#endif
-  /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#if (IMR_MSK & ISTR_DOVR)
-  if (wIstr & ISTR_DOVR & wInterrupt_Mask)
-  {
-    _SetISTR((uint16_t)CLR_DOVR);
-#ifdef DOVR_CALLBACK
-    DOVR_Callback();
-#endif
-  }
-#endif
-  /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#if (IMR_MSK & ISTR_ERR)
-  if (wIstr & ISTR_ERR & wInterrupt_Mask)
-  {
-    _SetISTR((uint16_t)CLR_ERR);
-#ifdef ERR_CALLBACK
-    ERR_Callback();
-#endif
-  }
-#endif
-  /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#if (IMR_MSK & ISTR_WKUP)
-  if (wIstr & ISTR_WKUP & wInterrupt_Mask)
-  {
-    _SetISTR((uint16_t)CLR_WKUP);
-    Resume(RESUME_EXTERNAL);
-#ifdef WKUP_CALLBACK
-    WKUP_Callback();
-#endif
-  }
-#endif
-  /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#if (IMR_MSK & ISTR_SUSP)
-  if (wIstr & ISTR_SUSP & wInterrupt_Mask)
-  {
-
-    /* check if SUSPEND is possible */
-    if (fSuspendEnabled)
-    {
-      Suspend();
-    }
-    else
-    {
-      /* if not possible then resume after xx ms */
-      Resume(RESUME_LATER);
-    }
-    /* clear of the ISTR bit must be done after setting of CNTR_FSUSP */
-    _SetISTR((uint16_t)CLR_SUSP);
-#ifdef SUSP_CALLBACK
-    SUSP_Callback();
-#endif
-  }
-#endif
-  /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#if (IMR_MSK & ISTR_SOF)
-  if (wIstr & ISTR_SOF & wInterrupt_Mask)
-  {
-    _SetISTR((uint16_t)CLR_SOF);
-    bIntPackSOF++;
-
-#ifdef SOF_CALLBACK
-    SOF_Callback();
-#endif
-  }
-#endif
-  /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#if (IMR_MSK & ISTR_ESOF)
-  if (wIstr & ISTR_ESOF & wInterrupt_Mask)
-  {
-    _SetISTR((uint16_t)CLR_ESOF);
-    /* resume handling timing is made with ESOFs */
-    Resume(RESUME_ESOF); /* request without change of the machine state */
-
-#ifdef ESOF_CALLBACK
-    ESOF_Callback();
-#endif
-  }
-#endif
-} /* USB_Istr */
-
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#else /* STM32F10X_CL */
-
-
-/*******************************************************************************
-* Function Name  : STM32_PCD_OTG_ISR_Handler
-* Description    : Handles all USB Device Interrupts
-* Input          : None
-* Output         : None
-* Return         : status
-*******************************************************************************/
-u32 STM32_PCD_OTG_ISR_Handler (void)
-{
-  USB_OTG_int_sts_data gintr_status;
-  u32 retval = 0;
-
-  if (IsDeviceMode()) /* ensure that we are in device mode */
-  {
-    gintr_status.d32 = OTGD_FS_ReadCoreItr();
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    
-    /* If there is no interrupt pending exit the interrupt routine */
-    if (!gintr_status.d32)
-    {
-      return 0;
-    }
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Early Suspend interrupt */ 
-#ifdef INTR_ERLYSUSPEND
-    if (gintr_status.b.erlysuspend)
-    {
-      retval |= OTGD_FS_Handle_EarlySuspend_ISR();
-    }
-#endif /* INTR_ERLYSUSPEND */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* End of Periodic Frame interrupt */
-#ifdef INTR_EOPFRAME    
-    if (gintr_status.b.eopframe)
-    {
-      retval |= OTGD_FS_Handle_EOPF_ISR();
-    }
-#endif /* INTR_EOPFRAME */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* Non Periodic Tx FIFO Emty interrupt */
-#ifdef INTR_NPTXFEMPTY    
-    if (gintr_status.b.nptxfempty)
-    {
-      retval |= OTGD_FS_Handle_NPTxFE_ISR();
-    }
-#endif /* INTR_NPTXFEMPTY */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Wakeup or RemoteWakeup interrupt */
-#ifdef INTR_WKUPINTR    
-    if (gintr_status.b.wkupintr)
-    {   
-      retval |= OTGD_FS_Handle_Wakeup_ISR();
-    }
-#endif /* INTR_WKUPINTR */   
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* Suspend interrupt */
-#ifdef INTR_USBSUSPEND
-    if (gintr_status.b.usbsuspend)
-    { 
-      /* check if SUSPEND is possible */
-      if (fSuspendEnabled)
-      {
-        Suspend();
-      }
-      else
-      {
-        /* if not possible then resume after xx ms */
-        Resume(RESUME_LATER); /* This case shouldn't happen in OTG Device mode because 
-        there's no ESOF interrupt to increment the ResumeS.bESOFcnt in the Resume state machine */
-      }
-            
-      retval |= OTGD_FS_Handle_USBSuspend_ISR();
-    }
-#endif /* INTR_USBSUSPEND */
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* Start of Frame interrupt */
-#ifdef INTR_SOFINTR    
-    if (gintr_status.b.sofintr)
-    {
-      /* Update the frame number variable */
-      bIntPackSOF++;
-      
-      retval |= OTGD_FS_Handle_Sof_ISR();
-    }
-#endif /* INTR_SOFINTR */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* Receive FIFO Queue Status Level interrupt */
-#ifdef INTR_RXSTSQLVL
-    if (gintr_status.b.rxstsqlvl)
-    {
-      retval |= OTGD_FS_Handle_RxStatusQueueLevel_ISR();
-    }
-#endif /* INTR_RXSTSQLVL */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* Enumeration Done interrupt */
-#ifdef INTR_ENUMDONE
-    if (gintr_status.b.enumdone)
-    {
-      retval |= OTGD_FS_Handle_EnumDone_ISR();
-    }
-#endif /* INTR_ENUMDONE */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* Reset interrutp */
-#ifdef INTR_USBRESET
-    if (gintr_status.b.usbreset)
-    {
-      retval |= OTGD_FS_Handle_UsbReset_ISR();
-    }    
-#endif /* INTR_USBRESET */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-    /* IN Endpoint interrupt */
-#ifdef INTR_INEPINTR
-    if (gintr_status.b.inepint)
-    {
-      retval |= OTGD_FS_Handle_InEP_ISR();
-    }
-#endif /* INTR_INEPINTR */
-    
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* OUT Endpoint interrupt */
-#ifdef INTR_OUTEPINTR
-    if (gintr_status.b.outepintr)
-    {
-      retval |= OTGD_FS_Handle_OutEP_ISR();
-    }
-#endif /* INTR_OUTEPINTR */    
- 
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Mode Mismatch interrupt */
-#ifdef INTR_MODEMISMATCH
-    if (gintr_status.b.modemismatch)
-    {
-      retval |= OTGD_FS_Handle_ModeMismatch_ISR();
-    }
-#endif /* INTR_MODEMISMATCH */  
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Global IN Endpoints NAK Effective interrupt */
-#ifdef INTR_GINNAKEFF
-    if (gintr_status.b.ginnakeff)
-    {
-      retval |= OTGD_FS_Handle_GInNakEff_ISR();
-    }
-#endif /* INTR_GINNAKEFF */  
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Global OUT Endpoints NAK effective interrupt */
-#ifdef INTR_GOUTNAKEFF
-    if (gintr_status.b.goutnakeff)
-    {
-      retval |= OTGD_FS_Handle_GOutNakEff_ISR();
-    }
-#endif /* INTR_GOUTNAKEFF */  
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Isochrounous Out packet Dropped interrupt */
-#ifdef INTR_ISOOUTDROP
-    if (gintr_status.b.isooutdrop)
-    {
-      retval |= OTGD_FS_Handle_IsoOutDrop_ISR();
-    }
-#endif /* INTR_ISOOUTDROP */  
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Endpoint Mismatch error interrupt */
-#ifdef INTR_EPMISMATCH
-    if (gintr_status.b.epmismatch)
-    {
-      retval |= OTGD_FS_Handle_EPMismatch_ISR();
-    }
-#endif /* INTR_EPMISMATCH */  
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Incomplete Isochrous IN tranfer error interrupt */
-#ifdef INTR_INCOMPLISOIN
-    if (gintr_status.b.incomplisoin)
-    {
-      retval |= OTGD_FS_Handle_IncomplIsoIn_ISR();
-    }
-#endif /* INTR_INCOMPLISOIN */  
-
-   /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/    
-    /* Incomplete Isochrous OUT tranfer error interrupt */
-#ifdef INTR_INCOMPLISOOUT
-    if (gintr_status.b.outepintr)
-    {
-      retval |= OTGD_FS_Handle_IncomplIsoOut_ISR();
-    }
-#endif /* INTR_INCOMPLISOOUT */  
-  
-  }
-  return retval;
-}
-
-#endif /* STM32F10X_CL */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/usb_istr.h

@@ -1,104 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_istr.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : This file includes the peripherals header files in the
-*                      user application.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_ISTR_H
-#define __USB_ISTR_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_conf.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#ifndef STM32F10X_CL
- void USB_Istr(void);
-#else /* STM32F10X_CL */
- u32 STM32_PCD_OTG_ISR_Handler(void);
-#endif /* STM32F10X_CL */
-
-
-#ifndef STM32F10X_CL
-
-#ifdef CTR_CALLBACK
-void CTR_Callback(void);
-#endif
-
-#ifdef DOVR_CALLBACK
-void DOVR_Callback(void);
-#endif
-
-#ifdef ERR_CALLBACK
-void ERR_Callback(void);
-#endif
-
-#ifdef WKUP_CALLBACK
-void WKUP_Callback(void);
-#endif
-
-#ifdef SUSP_CALLBACK
-void SUSP_Callback(void);
-#endif
-
-#ifdef RESET_CALLBACK
-void RESET_Callback(void);
-#endif
-
-#ifdef SOF_CALLBACK
-void SOF_Callback(void);
-#endif
-
-#ifdef ESOF_CALLBACK
-void ESOF_Callback(void);
-#endif
-
-#else /* STM32F10X_CL */
-
-/* Interrupt subroutines user callbacks prototypes.
-   These callbacks are called into the respective interrupt sunroutine functinos
-   and can be tailored for various user application purposes.
-     Note: Make sure that the correspondant interrupt is enabled through the 
-     definition in usb_conf.h file */ 
-void INTR_MODEMISMATCH_Callback(void);
-void INTR_SOFINTR_Callback(void);
-void INTR_RXSTSQLVL_Callback(void);
-void INTR_NPTXFEMPTY_Callback(void);
-void INTR_GINNAKEFF_Callback(void);
-void INTR_GOUTNAKEFF_Callback(void);
-void INTR_ERLYSUSPEND_Callback(void);
-void INTR_USBSUSPEND_Callback(void);
-void INTR_USBRESET_Callback(void);
-void INTR_ENUMDONE_Callback(void);
-void INTR_ISOOUTDROP_Callback(void);
-void INTR_EOPFRAME_Callback(void);
-void INTR_EPMISMATCH_Callback(void);
-void INTR_INEPINTR_Callback(void);
-void INTR_OUTEPINTR_Callback(void);
-void INTR_INCOMPLISOIN_Callback(void);
-void INTR_INCOMPLISOOUT_Callback(void);
-void INTR_WKUPINTR_Callback(void);
-
-/* Isochronous data update */
-void INTR_RXSTSQLVL_ISODU_Callback(void); 
-
-#endif /* STM32F10X_CL */
-
-
-#endif /*__USB_ISTR_H*/
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/usb_prop.c

@@ -1,419 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_prop.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : All processing related to Virtual Com Port Demo
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "usb_lib.h"
-#include "usb_conf.h"
-#include "usb_prop.h"
-#include "usb_desc.h"
-#include "usb_pwr.h"
-#include "hw_config.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-uint8_t Request = 0;
-
-LINE_CODING linecoding =
-  {
-    115200, /* baud rate*/
-    0x00,   /* stop bits-1*/
-    0x00,   /* parity - none*/
-    0x08    /* no. of bits 8*/
-  };
-
-/* -------------------------------------------------------------------------- */
-/*  Structures initializations */
-/* -------------------------------------------------------------------------- */
-
-DEVICE Device_Table =
-  {
-    EP_NUM,
-    1
-  };
-
-DEVICE_PROP Device_Property =
-  {
-    Virtual_Com_Port_init,
-    Virtual_Com_Port_Reset,
-    Virtual_Com_Port_Status_In,
-    Virtual_Com_Port_Status_Out,
-    Virtual_Com_Port_Data_Setup,
-    Virtual_Com_Port_NoData_Setup,
-    Virtual_Com_Port_Get_Interface_Setting,
-    Virtual_Com_Port_GetDeviceDescriptor,
-    Virtual_Com_Port_GetConfigDescriptor,
-    Virtual_Com_Port_GetStringDescriptor,
-    0,
-    0x40 /*MAX PACKET SIZE*/
-  };
-
-USER_STANDARD_REQUESTS User_Standard_Requests =
-  {
-    Virtual_Com_Port_GetConfiguration,
-    Virtual_Com_Port_SetConfiguration,
-    Virtual_Com_Port_GetInterface,
-    Virtual_Com_Port_SetInterface,
-    Virtual_Com_Port_GetStatus,
-    Virtual_Com_Port_ClearFeature,
-    Virtual_Com_Port_SetEndPointFeature,
-    Virtual_Com_Port_SetDeviceFeature,
-    Virtual_Com_Port_SetDeviceAddress
-  };
-
-ONE_DESCRIPTOR Device_Descriptor =
-  {
-    (uint8_t*)Virtual_Com_Port_DeviceDescriptor,
-    VIRTUAL_COM_PORT_SIZ_DEVICE_DESC
-  };
-
-ONE_DESCRIPTOR Config_Descriptor =
-  {
-    (uint8_t*)Virtual_Com_Port_ConfigDescriptor,
-    VIRTUAL_COM_PORT_SIZ_CONFIG_DESC
-  };
-
-ONE_DESCRIPTOR String_Descriptor[4] =
-  {
-    {(uint8_t*)Virtual_Com_Port_StringLangID, VIRTUAL_COM_PORT_SIZ_STRING_LANGID},
-    {(uint8_t*)Virtual_Com_Port_StringVendor, VIRTUAL_COM_PORT_SIZ_STRING_VENDOR},
-    {(uint8_t*)Virtual_Com_Port_StringProduct, VIRTUAL_COM_PORT_SIZ_STRING_PRODUCT},
-    {(uint8_t*)Virtual_Com_Port_StringSerial, VIRTUAL_COM_PORT_SIZ_STRING_SERIAL}
-  };
-
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Extern function prototypes ------------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_init.
-* Description    : Virtual COM Port Mouse init routine.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Virtual_Com_Port_init(void)
-{
-
-  /* Update the serial number string descriptor with the data from the unique
-  ID*/
-  Get_SerialNum();
-
-  pInformation->Current_Configuration = 0;
-
-  /* Connect the device */
-  PowerOn();
-
-  /* Perform basic device initialization operations */
-  USB_SIL_Init();
-
-  /* configure the USART to the default settings */
-  //USART_Config_Default();
-
-  bDeviceState = UNCONNECTED;
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_Reset
-* Description    : Virtual_Com_Port Mouse reset routine
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Virtual_Com_Port_Reset(void)
-{
-  /* Set Virtual_Com_Port DEVICE as not configured */
-  pInformation->Current_Configuration = 0;
-
-  /* Current Feature initialization */
-  pInformation->Current_Feature = Virtual_Com_Port_ConfigDescriptor[7];
-
-  /* Set Virtual_Com_Port DEVICE with the default Interface*/
-  pInformation->Current_Interface = 0;
-
-#ifdef STM32F10X_CL     
-  /* EP0 is already configured by USB_SIL_Init() function */
-  
-  /* Init EP1 IN as Bulk endpoint */
-  OTG_DEV_EP_Init(EP1_IN, OTG_DEV_EP_TYPE_BULK, VIRTUAL_COM_PORT_DATA_SIZE);
-  
-  /* Init EP2 IN as Interrupt endpoint */
-  OTG_DEV_EP_Init(EP2_IN, OTG_DEV_EP_TYPE_INT, VIRTUAL_COM_PORT_INT_SIZE);
-
-  /* Init EP3 OUT as Bulk endpoint */
-  OTG_DEV_EP_Init(EP3_OUT, OTG_DEV_EP_TYPE_BULK, VIRTUAL_COM_PORT_DATA_SIZE);  
-#else 
-
-  SetBTABLE(BTABLE_ADDRESS);
-
-  /* Initialize Endpoint 0 */
-  SetEPType(ENDP0, EP_CONTROL);
-  SetEPTxStatus(ENDP0, EP_TX_STALL);
-  SetEPRxAddr(ENDP0, ENDP0_RXADDR);
-  SetEPTxAddr(ENDP0, ENDP0_TXADDR);
-  Clear_Status_Out(ENDP0);
-  SetEPRxCount(ENDP0, Device_Property.MaxPacketSize);
-  SetEPRxValid(ENDP0);
-
-  /* Initialize Endpoint 1 */
-  SetEPType(ENDP1, EP_BULK);
-  SetEPTxAddr(ENDP1, ENDP1_TXADDR);
-  SetEPTxStatus(ENDP1, EP_TX_NAK);
-  SetEPRxStatus(ENDP1, EP_RX_DIS);
-
-  /* Initialize Endpoint 2 */
-  SetEPType(ENDP2, EP_INTERRUPT);
-  SetEPTxAddr(ENDP2, ENDP2_TXADDR);
-  SetEPRxStatus(ENDP2, EP_RX_DIS);
-  SetEPTxStatus(ENDP2, EP_TX_NAK);
-
-  /* Initialize Endpoint 3 */
-  SetEPType(ENDP3, EP_BULK);
-  SetEPRxAddr(ENDP3, ENDP3_RXADDR);
-  SetEPRxCount(ENDP3, VIRTUAL_COM_PORT_DATA_SIZE);
-  SetEPRxStatus(ENDP3, EP_RX_VALID);
-  SetEPTxStatus(ENDP3, EP_TX_DIS);
-
-  /* Set this device to response on default address */
-  SetDeviceAddress(0);
-#endif /* STM32F10X_CL */
-
-  bDeviceState = ATTACHED;
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_SetConfiguration.
-* Description    : Udpade the device state to configured.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Virtual_Com_Port_SetConfiguration(void)
-{
-  DEVICE_INFO *pInfo = &Device_Info;
-
-  if (pInfo->Current_Configuration != 0)
-  {
-    /* Device configured */
-    bDeviceState = CONFIGURED;
-  }
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_SetConfiguration.
-* Description    : Udpade the device state to addressed.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Virtual_Com_Port_SetDeviceAddress (void)
-{
-  bDeviceState = ADDRESSED;
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_Status_In.
-* Description    : Virtual COM Port Status In Routine.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Virtual_Com_Port_Status_In(void)
-{
-  if (Request == SET_LINE_CODING)
-  {
-    //USART_Config();
-    Request = 0;
-  }
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_Status_Out
-* Description    : Virtual COM Port Status OUT Routine.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Virtual_Com_Port_Status_Out(void)
-{}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_Data_Setup
-* Description    : handle the data class specific requests
-* Input          : Request Nb.
-* Output         : None.
-* Return         : USB_UNSUPPORT or USB_SUCCESS.
-*******************************************************************************/
-RESULT Virtual_Com_Port_Data_Setup(uint8_t RequestNo)
-{
-  uint8_t    *(*CopyRoutine)(uint16_t);
-
-  CopyRoutine = NULL;
-
-  if (RequestNo == GET_LINE_CODING)
-  {
-    if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT))
-    {
-      CopyRoutine = Virtual_Com_Port_GetLineCoding;
-    }
-  }
-  else if (RequestNo == SET_LINE_CODING)
-  {
-    if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT))
-    {
-      CopyRoutine = Virtual_Com_Port_SetLineCoding;
-    }
-    Request = SET_LINE_CODING;
-  }
-
-  if (CopyRoutine == NULL)
-  {
-    return USB_UNSUPPORT;
-  }
-
-  pInformation->Ctrl_Info.CopyData = CopyRoutine;
-  pInformation->Ctrl_Info.Usb_wOffset = 0;
-  (*CopyRoutine)(0);
-  return USB_SUCCESS;
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_NoData_Setup.
-* Description    : handle the no data class specific requests.
-* Input          : Request Nb.
-* Output         : None.
-* Return         : USB_UNSUPPORT or USB_SUCCESS.
-*******************************************************************************/
-RESULT Virtual_Com_Port_NoData_Setup(uint8_t RequestNo)
-{
-
-  if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT))
-  {
-    if (RequestNo == SET_COMM_FEATURE)
-    {
-      return USB_SUCCESS;
-    }
-    else if (RequestNo == SET_CONTROL_LINE_STATE)
-    {
-      return USB_SUCCESS;
-    }
-  }
-
-  return USB_UNSUPPORT;
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_GetDeviceDescriptor.
-* Description    : Gets the device descriptor.
-* Input          : Length.
-* Output         : None.
-* Return         : The address of the device descriptor.
-*******************************************************************************/
-uint8_t *Virtual_Com_Port_GetDeviceDescriptor(uint16_t Length)
-{
-  return Standard_GetDescriptorData(Length, &Device_Descriptor);
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_GetConfigDescriptor.
-* Description    : get the configuration descriptor.
-* Input          : Length.
-* Output         : None.
-* Return         : The address of the configuration descriptor.
-*******************************************************************************/
-uint8_t *Virtual_Com_Port_GetConfigDescriptor(uint16_t Length)
-{
-  return Standard_GetDescriptorData(Length, &Config_Descriptor);
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_GetStringDescriptor
-* Description    : Gets the string descriptors according to the needed index
-* Input          : Length.
-* Output         : None.
-* Return         : The address of the string descriptors.
-*******************************************************************************/
-uint8_t *Virtual_Com_Port_GetStringDescriptor(uint16_t Length)
-{
-  uint8_t wValue0 = pInformation->USBwValue0;
-  if (wValue0 > 4)
-  {
-    return NULL;
-  }
-  else
-  {
-    return Standard_GetDescriptorData(Length, &String_Descriptor[wValue0]);
-  }
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_Get_Interface_Setting.
-* Description    : test the interface and the alternate setting according to the
-*                  supported one.
-* Input1         : uint8_t: Interface : interface number.
-* Input2         : uint8_t: AlternateSetting : Alternate Setting number.
-* Output         : None.
-* Return         : The address of the string descriptors.
-*******************************************************************************/
-RESULT Virtual_Com_Port_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting)
-{
-  if (AlternateSetting > 0)
-  {
-    return USB_UNSUPPORT;
-  }
-  else if (Interface > 1)
-  {
-    return USB_UNSUPPORT;
-  }
-  return USB_SUCCESS;
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_GetLineCoding.
-* Description    : send the linecoding structure to the PC host.
-* Input          : Length.
-* Output         : None.
-* Return         : Inecoding structure base address.
-*******************************************************************************/
-uint8_t *Virtual_Com_Port_GetLineCoding(uint16_t Length)
-{
-  if (Length == 0)
-  {
-    pInformation->Ctrl_Info.Usb_wLength = sizeof(linecoding);
-    return NULL;
-  }
-  return(uint8_t *)&linecoding;
-}
-
-/*******************************************************************************
-* Function Name  : Virtual_Com_Port_SetLineCoding.
-* Description    : Set the linecoding structure fields.
-* Input          : Length.
-* Output         : None.
-* Return         : Linecoding structure base address.
-*******************************************************************************/
-uint8_t *Virtual_Com_Port_SetLineCoding(uint16_t Length)
-{
-  if (Length == 0)
-  {
-    pInformation->Ctrl_Info.Usb_wLength = sizeof(linecoding);
-    return NULL;
-  }
-  return(uint8_t *)&linecoding;
-}
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
-

Virtual_COM_Port/usb_prop.h

@@ -1,74 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_prop.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : All processing related to Virtual COM Port Demo (Endpoint 0)
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __usb_prop_H
-#define __usb_prop_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-typedef struct
-{
-  uint32_t bitrate;
-  uint8_t format;
-  uint8_t paritytype;
-  uint8_t datatype;
-}LINE_CODING;
-
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported define -----------------------------------------------------------*/
-
-#define Virtual_Com_Port_GetConfiguration          NOP_Process
-//#define Virtual_Com_Port_SetConfiguration          NOP_Process
-#define Virtual_Com_Port_GetInterface              NOP_Process
-#define Virtual_Com_Port_SetInterface              NOP_Process
-#define Virtual_Com_Port_GetStatus                 NOP_Process
-#define Virtual_Com_Port_ClearFeature              NOP_Process
-#define Virtual_Com_Port_SetEndPointFeature        NOP_Process
-#define Virtual_Com_Port_SetDeviceFeature          NOP_Process
-//#define Virtual_Com_Port_SetDeviceAddress          NOP_Process
-
-#define SEND_ENCAPSULATED_COMMAND   0x00
-#define GET_ENCAPSULATED_RESPONSE   0x01
-#define SET_COMM_FEATURE            0x02
-#define GET_COMM_FEATURE            0x03
-#define CLEAR_COMM_FEATURE          0x04
-#define SET_LINE_CODING             0x20
-#define GET_LINE_CODING             0x21
-#define SET_CONTROL_LINE_STATE      0x22
-#define SEND_BREAK                  0x23
-
-/* Exported functions ------------------------------------------------------- */
-void Virtual_Com_Port_init(void);
-void Virtual_Com_Port_Reset(void);
-void Virtual_Com_Port_SetConfiguration(void);
-void Virtual_Com_Port_SetDeviceAddress (void);
-void Virtual_Com_Port_Status_In (void);
-void Virtual_Com_Port_Status_Out (void);
-RESULT Virtual_Com_Port_Data_Setup(uint8_t);
-RESULT Virtual_Com_Port_NoData_Setup(uint8_t);
-RESULT Virtual_Com_Port_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting);
-uint8_t *Virtual_Com_Port_GetDeviceDescriptor(uint16_t );
-uint8_t *Virtual_Com_Port_GetConfigDescriptor(uint16_t);
-uint8_t *Virtual_Com_Port_GetStringDescriptor(uint16_t);
-
-uint8_t *Virtual_Com_Port_GetLineCoding(uint16_t Length);
-uint8_t *Virtual_Com_Port_SetLineCoding(uint16_t Length);
-
-#endif /* __usb_prop_H */
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
-

Virtual_COM_Port/usb_pwr.c

@@ -1,251 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_pwr.c
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Connection/disconnection & power management
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x.h"
-#include "usb_lib.h"
-#include "usb_conf.h"
-#include "usb_pwr.h"
-#include "hw_config.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-__IO uint32_t bDeviceState = UNCONNECTED; /* USB device status */
-__IO bool fSuspendEnabled = TRUE;  /* true when suspend is possible */
-
-struct
-{
-  __IO RESUME_STATE eState;
-  __IO uint8_t bESOFcnt;
-}ResumeS;
-
-/* Extern variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Extern function prototypes ------------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name  : PowerOn
-* Description    :
-* Input          : None.
-* Output         : None.
-* Return         : USB_SUCCESS.
-*******************************************************************************/
-RESULT PowerOn(void)
-{
-#ifndef STM32F10X_CL
-  uint16_t wRegVal;
-
-  /*** cable plugged-in ? ***/
-  USB_Cable_Config(ENABLE);
-
-  /*** CNTR_PWDN = 0 ***/
-  wRegVal = CNTR_FRES;
-  _SetCNTR(wRegVal);
-
-  /*** CNTR_FRES = 0 ***/
-  wInterrupt_Mask = 0;
-  _SetCNTR(wInterrupt_Mask);
-  /*** Clear pending interrupts ***/
-  _SetISTR(0);
-  /*** Set interrupt mask ***/
-  wInterrupt_Mask = CNTR_RESETM | CNTR_SUSPM | CNTR_WKUPM;
-  _SetCNTR(wInterrupt_Mask);
-#endif /* STM32F10X_CL */
-
-  return USB_SUCCESS;
-}
-
-/*******************************************************************************
-* Function Name  : PowerOff
-* Description    : handles switch-off conditions
-* Input          : None.
-* Output         : None.
-* Return         : USB_SUCCESS.
-*******************************************************************************/
-RESULT PowerOff()
-{
-#ifndef STM32F10X_CL
-  /* disable all ints and force USB reset */
-  _SetCNTR(CNTR_FRES);
-  /* clear interrupt status register */
-  _SetISTR(0);
-  /* Disable the Pull-Up*/
-  USB_Cable_Config(DISABLE);
-  /* switch-off device */
-  _SetCNTR(CNTR_FRES + CNTR_PDWN);
-#endif /* STM32F10X_CL */
-
-  /* sw variables reset */
-  /* ... */
-
-  return USB_SUCCESS;
-}
-
-/*******************************************************************************
-* Function Name  : Suspend
-* Description    : sets suspend mode operating conditions
-* Input          : None.
-* Output         : None.
-* Return         : USB_SUCCESS.
-*******************************************************************************/
-void Suspend(void)
-{
-#ifndef STM32F10X_CL
-  uint16_t wCNTR;
-  /* suspend preparation */
-  /* ... */
-
-  /* macrocell enters suspend mode */
-  wCNTR = _GetCNTR();
-  wCNTR |= CNTR_FSUSP;
-  _SetCNTR(wCNTR);
-#endif /* STM32F10X_CL */
-
-  /* ------------------ ONLY WITH BUS-POWERED DEVICES ---------------------- */
-  /* power reduction */
-  /* ... on connected devices */
-
-#ifndef STM32F10X_CL
-  /* force low-power mode in the macrocell */
-  wCNTR = _GetCNTR();
-  wCNTR |= CNTR_LPMODE;
-  _SetCNTR(wCNTR);
-#endif /* STM32F10X_CL */
-
-  /* switch-off the clocks */
-  /* ... */
-  Enter_LowPowerMode();
-
-}
-
-/*******************************************************************************
-* Function Name  : Resume_Init
-* Description    : Handles wake-up restoring normal operations
-* Input          : None.
-* Output         : None.
-* Return         : USB_SUCCESS.
-*******************************************************************************/
-void Resume_Init(void)
-{
-#ifndef STM32F10X_CL
-  uint16_t wCNTR;
-#endif /* STM32F10X_CL */ 
-
-  /* ------------------ ONLY WITH BUS-POWERED DEVICES ---------------------- */
-  /* restart the clocks */
-  /* ...  */
-
-#ifndef STM32F10X_CL
-  /* CNTR_LPMODE = 0 */
-  wCNTR = _GetCNTR();
-  wCNTR &= (~CNTR_LPMODE);
-  _SetCNTR(wCNTR);
-#endif /* STM32F10X_CL */ 
-
-  /* restore full power */
-  /* ... on connected devices */
-  Leave_LowPowerMode();
-
-#ifndef STM32F10X_CL
-  /* reset FSUSP bit */
-  _SetCNTR(IMR_MSK);
-#endif /* STM32F10X_CL */
-
-  /* reverse suspend preparation */
-  /* ... */
-
-}
-
-/*******************************************************************************
-* Function Name  : Resume
-* Description    : This is the state machine handling resume operations and
-*                 timing sequence. The control is based on the Resume structure
-*                 variables and on the ESOF interrupt calling this subroutine
-*                 without changing machine state.
-* Input          : a state machine value (RESUME_STATE)
-*                  RESUME_ESOF doesn't change ResumeS.eState allowing
-*                  decrementing of the ESOF counter in different states.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-void Resume(RESUME_STATE eResumeSetVal)
-{
-#ifndef STM32F10X_CL
-  uint16_t wCNTR;
-#endif /* STM32F10X_CL */
-
-  if (eResumeSetVal != RESUME_ESOF)
-    ResumeS.eState = eResumeSetVal;
-
-  switch (ResumeS.eState)
-  {
-    case RESUME_EXTERNAL:
-      Resume_Init();
-      ResumeS.eState = RESUME_OFF;
-      break;
-    case RESUME_INTERNAL:
-      Resume_Init();
-      ResumeS.eState = RESUME_START;
-      break;
-    case RESUME_LATER:
-      ResumeS.bESOFcnt = 2;
-      ResumeS.eState = RESUME_WAIT;
-      break;
-    case RESUME_WAIT:
-      ResumeS.bESOFcnt--;
-      if (ResumeS.bESOFcnt == 0)
-        ResumeS.eState = RESUME_START;
-      break;
-    case RESUME_START:
-     #ifdef STM32F10X_CL
-      OTGD_FS_Dev_SetRemoteWakeup();
-     #else 
-      wCNTR = _GetCNTR();
-      wCNTR |= CNTR_RESUME;
-      _SetCNTR(wCNTR);
-     #endif /* STM32F10X_CL */
-      ResumeS.eState = RESUME_ON;
-      ResumeS.bESOFcnt = 10;
-      break;
-    case RESUME_ON:
-    #ifndef STM32F10X_CL      
-      ResumeS.bESOFcnt--;
-      if (ResumeS.bESOFcnt == 0)
-      {
-     #endif /* STM32F10X_CL */    
-       #ifdef STM32F10X_CL
-        OTGD_FS_Dev_ResetRemoteWakeup();
-       #else
-        wCNTR = _GetCNTR();
-        wCNTR &= (~CNTR_RESUME);
-        _SetCNTR(wCNTR);
-       #endif /* STM32F10X_CL */
-        ResumeS.eState = RESUME_OFF;
-     #ifndef STM32F10X_CL
-      }
-     #endif /* STM32F10X_CL */
-      break;
-    case RESUME_OFF:
-    case RESUME_ESOF:
-    default:
-      ResumeS.eState = RESUME_OFF;
-      break;
-  }
-}
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

Virtual_COM_Port/usb_pwr.h

@@ -1,59 +0,0 @@
-/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
-* File Name          : usb_pwr.h
-* Author             : MCD Application Team
-* Version            : V3.1.1
-* Date               : 04/07/2010
-* Description        : Connection/disconnection & power management header
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
-* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
-* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_PWR_H
-#define __USB_PWR_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-typedef enum _RESUME_STATE
-{
-  RESUME_EXTERNAL,
-  RESUME_INTERNAL,
-  RESUME_LATER,
-  RESUME_WAIT,
-  RESUME_START,
-  RESUME_ON,
-  RESUME_OFF,
-  RESUME_ESOF
-} RESUME_STATE;
-
-typedef enum _DEVICE_STATE
-{
-  UNCONNECTED,
-  ATTACHED,
-  POWERED,
-  SUSPENDED,
-  ADDRESSED,
-  CONFIGURED
-} DEVICE_STATE;
-
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void Suspend(void);
-void Resume_Init(void);
-void Resume(RESUME_STATE eResumeSetVal);
-RESULT PowerOn(void);
-RESULT PowerOff(void);
-
-/* External variables --------------------------------------------------------*/
-extern  __IO uint32_t bDeviceState; /* USB device status */
-extern __IO bool fSuspendEnabled;  /* true when suspend is possible */
-
-#endif  /*__USB_PWR_H*/
-
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

boards/CQ_STARM/board.c

@@ -4,34 +4,8 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
   hwinit1_common ();
 }
-
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  /* CQ STARM has no functionality to stop USB.  */
-  /*
-   * It seems that users can add the functionality with USB_DC (PD9)
-   * though
-   */
-  (void)NewState;
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palSetPad (IOPORT3, GPIOC_LED);
-  else
-    palClearPad (IOPORT3, GPIOC_LED);
-}

boards/CQ_STARM/board.h

@@ -30,6 +30,10 @@
 /*
  * Setup for the CQ STARM board.
  */
+#undef	SET_USB_CONDITION		/* No functionality to disconnect USB */
+#define	SET_LED_CONDITION(on) on	/* To emit light, call palSetPad */
+#define GPIO_LED	GPIOC_LED
+#define IOPORT_LED	GPIOC
 
 /*
  * Board identifier.

boards/FST_01/board.c

@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
@@ -48,24 +42,6 @@ hwinit1 (void)
 #endif
 }
 
-void
-USB_Cable_Config (int NewState)
-{
-  if (NewState != DISABLE)
-    palSetPad (IOPORT1, GPIOA_USB_ENABLE);
-  else
-    palClearPad (IOPORT1, GPIOA_USB_ENABLE);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palSetPad (IOPORT2, GPIOB_LED);
-  else
-    palClearPad (IOPORT2, GPIOB_LED);
-}
-
 #if defined(PINPAD_CIR_SUPPORT)
 void
 cir_ext_disable (void)

boards/FST_01/board.h

@@ -30,6 +30,12 @@
 /*
  * Setup for the FST-01 board.
  */
+#define	SET_USB_CONDITION(en) en	/* To connect USB, call palSetPad */
+#define	SET_LED_CONDITION(on) on	/* To emit light, call palSetPad */
+#define GPIO_USB	GPIOA_USB_ENABLE
+#define IOPORT_USB	GPIOA
+#define GPIO_LED	GPIOB_LED
+#define IOPORT_LED	GPIOB
 
 /*
  * Board identifier.
@@ -91,12 +97,15 @@
  * PA0  - input with pull-up (TIM2_CH1)
  * PA1  - input with pull-down (TIM2_CH2)
  * PA2  - input with pull-up (TIM2_CH3)
+ * PA4  - Push pull output   (SPI1_NSS)
+ * PA5  - Alternate Push pull output (SPI1_SCK)
+ * PA6  - Alternate Push pull output (SPI1_MISO)
+ * PA7  - Alternate Push pull output (SPI1_MOSI)
+ * PA10 - Push pull output   (USB 1:ON 0:OFF)
  * PA11 - input with pull-up (USBDM)
  * PA12 - input with pull-up (USBDP)
- * Everything input with pull-up except:
- * PA10 - Push pull output   (USB 1:ON 0:OFF)
  */
-#define VAL_GPIOACRL            0x88888888      /*  PA7...PA0 */
+#define VAL_GPIOACRL            0xBBB38888      /*  PA7...PA0 */
 #define VAL_GPIOACRH            0x88888388      /* PA15...PA8 */
 #define VAL_GPIOAODR            0xFFFFFFFD
 

boards/FST_01_00/board.c

@@ -4,33 +4,8 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
   hwinit1_common ();
 }
-
-
-void
-USB_Cable_Config (int NewState)
-{
-  if (NewState != DISABLE)
-    palSetPad (IOPORT1, GPIOA_USB_ENABLE);
-  else
-    palClearPad (IOPORT1, GPIOA_USB_ENABLE);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palSetPad (IOPORT1, GPIOA_LED);
-  else
-    palClearPad (IOPORT1, GPIOA_LED);
-}

boards/FST_01_00/board.h

@@ -30,6 +30,12 @@
 /*
  * Setup for the FST-01 board (experimental version 00).
  */
+#define	SET_USB_CONDITION(en) en	/* To connect USB, call palSetPad */
+#define	SET_LED_CONDITION(on) on	/* To emit light, call palSetPad */
+#define GPIO_USB	GPIOA_USB_ENABLE
+#define IOPORT_USB	GPIOA
+#define GPIO_LED	GPIOA_LED
+#define IOPORT_LED	GPIOA
 
 /*
  * Board identifier.

boards/OLIMEX_STM32_H103/board.c

@@ -4,32 +4,8 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
   hwinit1_common ();
 }
-
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  if (NewState != DISABLE)
-    palClearPad (IOPORT3, GPIOC_DISC);
-  else
-    palSetPad (IOPORT3, GPIOC_DISC);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palClearPad (IOPORT3, GPIOC_LED);
-  else
-    palSetPad (IOPORT3, GPIOC_LED);
-}

boards/OLIMEX_STM32_H103/board.h

@@ -30,6 +30,12 @@
 /*
  * Setup for the Olimex STM32-H103 proto board.
  */
+#define	SET_USB_CONDITION(en) (!en)	/* To connect USB, call palClearPad */
+#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
+#define GPIO_USB	GPIOC_DISC
+#define IOPORT_USB	GPIOC
+#define GPIO_LED	GPIOC_LED
+#define IOPORT_LED	GPIOC
 
 /*
  * Board identifier.

boards/STBEE/board.c

@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
@@ -70,24 +64,6 @@ hwinit1 (void)
 #endif
 }
 
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  if (NewState != DISABLE)
-    palClearPad (IOPORT4, GPIOD_USB_ENABLE);
-  else
-    palSetPad (IOPORT4, GPIOD_USB_ENABLE);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palClearPad (IOPORT4, GPIOD_LED1);
-  else
-    palSetPad (IOPORT4, GPIOD_LED1);
-}
-
 #if defined(PINPAD_CIR_SUPPORT)
 void
 cir_ext_disable (void)

boards/STBEE/board.h

@@ -31,6 +31,12 @@
 /*
  * Setup for the STBee board.
  */
+#define	SET_USB_CONDITION(en) (!en)	/* To connect USB, call palClearPad */
+#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
+#define GPIO_USB	GPIOD_USB_ENABLE
+#define IOPORT_USB	GPIOD
+#define GPIO_LED	GPIOD_LED1
+#define IOPORT_LED	GPIOD
 
 /*
  * Board identifier.

boards/STBEE_MINI/board.c

@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
@@ -83,24 +77,6 @@ hwinit1 (void)
   palSetPad (IOPORT1, GPIOA_LED2);
 }
 
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  if (NewState != DISABLE)
-    palSetPad (IOPORT1, GPIOA_USB_ENABLE);
-  else
-    palClearPad (IOPORT1, GPIOA_USB_ENABLE);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palClearPad (IOPORT1, GPIOA_LED1);
-  else
-    palSetPad (IOPORT1, GPIOA_LED1);
-}
-
 #if defined(PINPAD_CIR_SUPPORT)
 void
 cir_ext_disable (void)

boards/STBEE_MINI/board.h

@@ -31,6 +31,12 @@
 /*
  * Setup for the STBee Mini board.
  */
+#define	SET_USB_CONDITION(en) (en)	/* To connect USB, call palSetPad */
+#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
+#define GPIO_USB	GPIOA_USB_ENABLE
+#define IOPORT_USB	GPIOA
+#define GPIO_LED	GPIOA_LED1
+#define IOPORT_LED	GPIOA
 
 /*
  * Board identifier.

boards/STM32_PRIMER2/board.c

@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0(void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1(void)
 {
@@ -21,21 +15,3 @@ hwinit1(void)
   palClearPad (IOPORT5, GPIOE_LED);
   palClearPad (IOPORT3, GPIOC_SHUTDOWN);
 }
-
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  if (NewState != DISABLE)
-    palClearPad (IOPORT4, GPIOD_DISC);
-  else
-    palSetPad (IOPORT4, GPIOD_DISC);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palClearPad (IOPORT5, GPIOE_LEDR);
-  else
-    palSetPad (IOPORT5, GPIOE_LEDR);
-}

boards/STM32_PRIMER2/board.h

@@ -30,6 +30,12 @@
 /*
  * Setup for the STM32 Primer2.
  */
+#define	SET_USB_CONDITION(en) (!en)	/* To connect USB, call palClearPad */
+#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
+#define GPIO_USB	GPIOD_DISC
+#define IOPORT_USB	GPIOD
+#define GPIO_LED	GPIOE_LEDR
+#define IOPORT_LED	GPIOE
 
 /*
  * Board identifier.

boards/STM8S_DISCOVERY/board.c

@@ -4,12 +4,6 @@
 
 #include "../common/hwinit.c"
 
-void
-hwinit0 (void)
-{
-  hwinit0_common ();
-}
-
 void
 hwinit1 (void)
 {
@@ -46,22 +40,6 @@ hwinit1 (void)
   AFIO->MAPR |= AFIO_MAPR_TIM3_REMAP_PARTIALREMAP;
 }
 
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  /* No functionality to stop USB.  */
-  (void)NewState;
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palSetPad (IOPORT1, GPIOA_LED);
-  else
-    palClearPad (IOPORT1, GPIOA_LED);
-}
-
 #if defined(PINPAD_CIR_SUPPORT)
 void
 cir_ext_disable (void)

boards/STM8S_DISCOVERY/board.h

@@ -32,11 +32,16 @@
  * Setup for the ST-Link part of STM8S-Discovery board.
  */
 
+#undef	SET_USB_CONDITION		/* No functionality to disconnect USB */
+#define	SET_LED_CONDITION(on) on	/* To emit light, call palSetPad */
+#define GPIO_LED	GPIOA_LED
+#define IOPORT_LED	GPIOA
+
 /*
  * Board identifier.
  */
 #define BOARD_ST_DISCOVERY
-#define BOARD_NAME "ST-Link"
+#define BOARD_NAME "STM8S Discovery"
 #define CPU_WITH_NO_GPIOE	1
 
 /*

boards/common/hw_config.c

@@ -1,42 +0,0 @@
-/* Hardware specific USB functions */
-/*
- * For detail, please see the documentation of 
- * STM32F10x USB Full Speed Device Library (USB-FS-Device_Lib)
- * by STMicroelectronics' MCD Application Team
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "board.h"
-#include "usb_lib.h"
-#include "usb_prop.h"
-#include "usb_desc.h"
-#include "hw_config.h"
-#include "platform_config.h"
-#include "usb_pwr.h"
-
-void
-Enter_LowPowerMode (void)
-{
-  bDeviceState = SUSPENDED;
-}
-
-void
-Leave_LowPowerMode (void)
-{
-  DEVICE_INFO *pInfo = &Device_Info;
-
-  if (pInfo->Current_Configuration != 0)
-    bDeviceState = CONFIGURED;
-  else
-    bDeviceState = ATTACHED;
-}
-
-const uint8_t *
-unique_device_id (void)
-{
-  /* STM32F103 has 96-bit unique device identifier */
-  const uint8_t *addr = (const uint8_t *)0x1ffff7e8;
-
-  return addr;
-}

boards/common/hwinit.c

@@ -29,15 +29,9 @@
  * This initialization is performed just after reset before BSS and DATA
  * segments initialization.
  */
-/*
- * Common code for hwinit0
- */
-static void hwinit0_common (void)
+void
+hwinit0 (void)
 {
-#ifdef DFU_SUPPORT
-  SCB->VTOR = 0x08003000;
-#endif
-
   stm32_clock_init();
 }
 

doc/Makefile

@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         = a4
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GnukDocumentation.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GnukDocumentation.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/GnukDocumentation"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GnukDocumentation"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."

doc/NOTES

@@ -1,46 +0,0 @@
-USB communication
-=================
-
-  * No command chaining, but extended APDU and extended Lc and Le.
-    I think that this keep the code simple.
-
-  * Once in the past (version <= 0.4), the value of
-    dwMaxCCIDMessageLength was 64 and we supported ICC block chaining,
-    so that we could not handle multple Bulk transactions.
-
-  * Now, the value of dwMaxCCIDMessageLength is 320, that's the size
-    of header of ICC block plus size of maximum APDU (by 64
-    granularity).  Still, some ccid implementation (ccid 1.3.11, for
-    example) sends ICC block using chaining unfortunately, so we keep
-    the code of ICC block chaining.
-
-
-OpenPGP card protocol implementation
-====================================
-
-I try to follow "no clear password(s)" policy, even if it is on
-protected flash memory.  Futher, keystrings for user and reset code
-are removed after key imports.  Because of this, replacing keys
-are not possible without password information.  Thus, replacing
-existing keys are not supported.
-
-
-How a private key is stored
-===========================
-
-KEYPTR
-         ----> [   P   ][   Q   ][       N        ]
-               <---encrypted----><---  plain  ---->
-
-key_addr                       4-byte
-additional_data_encrypted      16-byte
-dek_encrypted_by_keystring_pw1 16-byte
-dek_encrypted_by_keystring_rc  16-byte
-dek_encrypted_by_keystring_pw3 16-byte
-
-... decrypted to
-
-[   P   ][   Q   ]
-check   4-byte
-random  4-byte
-magic[] 8-byte

doc/conf.py

@@ -0,0 +1,246 @@
+# -*- coding: utf-8 -*-
+#
+# Gnuk Documentation documentation build configuration file, created by
+# sphinx-quickstart on Wed Jul  4 15:29:05 2012.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.pngmath', 'sphinx.ext.mathjax', 'sphinx.ext.viewcode']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Gnuk Documentation'
+copyright = u'2012, Niibe Yutaka'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '1.0'
+# The full version, including alpha/beta/rc tags.
+release = '1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'GnukDocumentationdoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'GnukDocumentation.tex', u'Gnuk Documentation Documentation',
+   u'Niibe Yutaka', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'gnukdocumentation', u'Gnuk Documentation Documentation',
+     [u'Niibe Yutaka'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'GnukDocumentation', u'Gnuk Documentation Documentation',
+   u'Niibe Yutaka', 'GnukDocumentation', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'http://docs.python.org/': None}

doc/development.rst

@@ -0,0 +1,60 @@
+Development Environment
+=======================
+
+
+Hardware
+--------
+
+JTAG debugger or SWD debugger is required.
+
+
+GNU Toolchain
+-------------
+
+You need GNU toolchain and newlib for 'arm-none-eabi' target.
+
+See http://github.com/esden/summon-arm-toolchain/ (which includes fix
+of binutils-2.21.1) for preparation of GNU Toolchain for
+'arm-none-eabi' target.  This is for GCC 4.5.
+
+Note that we need to link correct C library (for string functions).
+For this purpose, our src/Makefile.in contains following line:
+
+	MCFLAGS= -mcpu=$(MCU) -mfix-cortex-m3-ldrd
+
+This should not be needed (as -mcpu=cortex-m3 means
+-mfix-cortex-m3-ldrd), but it is needed for the configuration of
+patch-gcc-config-arm-t-arm-elf.diff in summon-arm-toolchain in practice.
+
+In ChibiOS_2.0.8/os/ports/GCC/ARM/rules.mk, it specifies
+-mno-thumb-interwork option.  This means that you should not link C
+library which contains ARM (not Thumb) code.
+
+Recently, there is "gcc-arm-embedded" project.  See:
+https://launchpad.net/gcc-arm-embedded/
+
+It is based on GCC 4.6.   For version 4.6-2012-q2-update, you'd
+need "-O3 -s" instead of "-O2" and it will be slightly better.
+
+
+
+Building Gnuk
+-------------
+
+Change directory to ``src``:
+
+  $ cd gnuk-VERSION/src
+
+Then, run ``configure``:
+
+  $ ./configure --vidpid=<VID:PID>
+
+Here, you need to specify USB vendor ID and product ID.  For FSIJ's,
+it's: --vidpid=234b:0000 .  Please read section 'USB vendor ID and
+product ID' above.
+
+Type:
+
+  $ make
+
+Then, we will have "gnuk.elf".

doc/index.rst

@@ -0,0 +1,24 @@
+.. Gnuk Documentation documentation master file, created by
+   sphinx-quickstart on Wed Jul  4 15:29:05 2012.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Gnuk Documentation
+==================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   intro.rst
+   development.rst
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

doc/intro.rst

@@ -0,0 +1,45 @@
+Introduction
+============
+
+
+What's Gnuk?
+------------
+
+Gnuk is an implementation of USB cryptographic token for GNU Privacy
+Guard.  Gnuk supports OpenPGP card protocol version 2, and it runs on
+STM32F103 processor.
+
+
+Cryptographic token and feature of Gnuk
+---------------------------------------
+
+Cryptographic token is a store of private keys and it computes cryptographic functions on the device.
+
+
+Development Environment
+-----------------------
+
+See :doc:`development` for development environment for Gnuk.  It builds on Free Software.
+
+
+Prerequisites
+-------------
+
+* GNU Privacy Guard (GnuPG)
+
+* libusb
+
+* [Optional] PC/SC lite (pcscd, libccid)
+
+* SSH: openssh
+
+* Web: scute, firefox
+
+
+Usage
+-----
+
+* Sign with GnuPG
+* Decrypt with GnuPG
+* Use with OpenSSH
+* Use with Firefox for X.509 client certificate authentication

doc/note/HACKING

@@ -1,4 +1,4 @@
-* Random Number Generator
+* [DONE] Random Number Generator
 
 RNG is needed for Data Encryption Key to encrypt private key (P and Q).
 It is important to collect enough entropy.  Perhaps, it would

doc/note/NOTES

@@ -0,0 +1,89 @@
+USB communication (current)
+===========================
+
+* Get response, command chaining, short APDU only.
+
+
+If it were only for token and no smartcard:
+
+* Get response, command chaining and short APDU would be considered
+  useless.
+
+* It would be wise to use extended APDU and CCID/ICCD block chaining.
+
+The question would be: When lower layer (CCID/ICCD layer) support
+enough mechanism of block assembly, why not use one in the application
+layer (ISO 7816)?
+
+For token implementation, CCID/ICCD would be lower layer and ISO 7816
+would be higher layer, but it's different in fact.  The figure of
+communication is like::
+
+    host <-----------> reader <---------> smartcard
+           CCID/ICCD           ISO 7816
+    
+    host <--> token
+
+Given the situation host side (GnuPG) already has the features of
+handling get response, command chaining, and short APDU only, it is
+rather better to do that on token side too.
+
+Besides, supporting extended APDU on host side, it would be needed to
+prepare 64KB buffer (that's the maximum size), as there is no explicit
+limitation for buffer size.  64KB would be large, and this could be
+avoided when we use short APDU only.
+
+
+USB communication (second attempt)
+==================================
+
+* No get response, no command chaining, but extended APDU and extended
+  Lc and Le.  I think that this keep the code simple.
+
+* The value of dwMaxCCIDMessageLength is 320, that's the size
+  of header of ICC block plus size of maximum APDU (by 64
+  granularity).  Still, some ccid implementation (ccid 1.3.11, for
+  example) sends ICC block using chaining unfortunately, so we keep
+  the code of ICC block chaining.
+
+
+USB communication (initial attempt)
+===================================
+
+* Once in the past (version <= 0.4), the value of
+  dwMaxCCIDMessageLength was 64 and we supported CCID/ICCD block chaining,
+  so that we could not handle multple Bulk transactions.
+
+
+OpenPGP card protocol implementation
+====================================
+
+I try to follow "no clear password(s)" policy, even if it is on
+protected flash memory.  Further, keystrings for user and reset code
+are removed after key imports.  Because of this, replacing keys are
+not possible without password information.  (Thus, replacing existing
+keys are not supported.)
+
+Therefore, there is "no clear password" and "no keystrings" on flash
+ROM when Gnuk is used by admin-less mode.  When it is used with admin,
+the keystring of admin is on flash ROM.
+
+
+How a private key is stored
+===========================
+
+KEYPTR
+         ----> [   P   ][   Q   ][       N        ]
+               <---encrypted----><---  plain  ---->
+
+key_addr                       4-byte
+initial_vector (random)        16-byte
+checksum_encrypted             16-byte
+dek_encrypted_by_keystring_pw1 16-byte
+dek_encrypted_by_keystring_rc  16-byte
+dek_encrypted_by_keystring_pw3 16-byte
+
+... decrypted to
+
+[   P   ][   Q   ]
+checksum 16-byte

doc/note/firmware-update

@@ -0,0 +1,132 @@
+Firmware update feature
+=======================
+
+The firmware update feature of Gnuk is experimental.  Please be
+careful using that.
+
+Note that updating firmware, all data objects and keys will be
+removed.  There is _no way_ to preserve those data.
+
+
+Preparation
+===========
+
+In addition to settings of Gnuk, I create a file
+/etc/udev/rules.d/92-gnuk.rules::
+
+   # For updating firmware, permission settings are needed.
+   
+   SUBSYSTEMS=="usb", ATTRS{idVendor}=="234b", ATTRS{idProduct}=="0000", \
+       ENV{ID_USB_INTERFACES}=="*:ff0000:*", GROUP="pcscd"
+
+
+While I am a member of group "pcscd" in /etc/group.
+
+This is needed for reGNUal, the firmware update program.
+
+
+Registering a public key for firmware update
+============================================
+
+You need to register a public key to update the firmware.  It should
+be RSA 2048-bit.
+
+One way to extract public key data is by using "gpg-connect-agent"
+command connecting gpg-agent.
+
+We can examine key information of gpg-agent by "KEYINFO" command.
+Here is my example::
+
+   $ gpg-connect-agent "KEYINFO --list" /bye
+   S KEYINFO 4970A0D537CA2EF7CE6A106E47AD89B0EFB684C8 D - - - - -
+   S KEYINFO 65F67E742101C7FE6D5B33FCEFCF4F65EAF0688C T D276000124010200F517000000010000 OPENPGP.2 - - -
+   S KEYINFO 5D6C89682D07CCFC034AF508420BF2276D8018ED T D276000124010200F517000000010000 OPENPGP.3 - - -
+   S KEYINFO 7D180C0C2A991B25204110A92F5F92A5A509845B D - - - - -
+   S KEYINFO 101DE7B639FE29F4636BDEECF442A9273AFA6565 T D276000124010200F517000000010000 OPENPGP.1 - - -
+   OK
+
+I have two local keys (in my PC) and three keys in my token.
+
+With the script below, I extract public key of the keygrip
+5D6C89682D07CCFC034AF508420BF2276D8018ED into the file: 5D6C8968.bin::
+
+   $ ./get_public_key.py 5D6C89682D07CCFC034AF508420BF2276D8018ED
+
+Here is the script, get_public_key.py::
+
+   #! /usr/bin/python
+   
+   import sys, binascii
+   from subprocess import check_output
+   
+   def get_gpg_public_key(keygrip):
+       result = check_output(["gpg-connect-agent", "READKEY %s" % keygrip, "/bye"])
+       key = ""
+       while True:
+              i = result.find('%')
+           if i < 0:
+               key += result
+               break
+           hex_str = result[i+1:i+3]
+           key += result[0:i]
+           key += chr(int(hex_str,16))
+           result = result[i+3:]
+
+       pos = key.index("D (10:public-key(3:rsa(1:n257:") + 31 # skip NUL too
+       key = key[pos:-17]           # )(1:e3:XYZ)))\nOK\n
+       if len(key) != 256:
+           raise ValueError, binascii.hexlify(key)
+       return key
+
+   if __name__ == '__main__':
+       keygrip = sys.argv[1]
+       k = get_gpg_public_key(keygrip)
+       shorthand = keygrip[0:8] + ".bin"
+       f = open(shorthand,"w")
+       f.write(k)
+       f.close()
+
+
+Then, we can put the data of public key into token by::
+
+   $ tool/gnuk_put_binary_libusb.py -k 0 5D6C8968.bin
+
+
+Invoking firmware update
+========================
+
+We specify reGNUal binary and Gnuk binary.
+
+  $ ../tool/gnuk_upgrade.py ../regnual/regnual.bin gnuk.bin 
+
+
+Two or more tokens
+==================
+
+Currently, GnuPG doesn't support multiple devices connected to the
+host.
+
+In order to update the firmware of a TARGET token, we use GnuPG to
+authenticate with public key.  It is assumed that you have another
+AUTH token for this.  This situation is somewhat complicated.
+
+What I do is:
+(1) Don't run PC/SC daemon::
+
+  # /etc/init.d/pcscd stop
+
+(2) To make sure, kill scdaemon::
+
+  $ killall -9 scdaemon
+
+(3) Insert the AUTH token to USB, and use it::
+
+  $ gpg --card-status
+
+(4) Insert the TARGET token to USB (after scdaemon communicates AUTH
+    token), and invoke gnuk_upgrade.py.
+    In this situation, gnuk_upgrade.py tries to connect one of tokens,
+    but a connection to the AUTH token will fail because scdaemon is
+    connecting to that device, and will be expected to connect to the
+    TARGET token succesufully, instead.
+-- 

polarssl-0.14.0/include/polarssl/aes.h

@@ -83,6 +83,7 @@ int aes_crypt_ecb( aes_context *ctx,
                     const unsigned char input[16],
                     unsigned char output[16] );
 
+#if 0
 /**
  * \brief          AES-CBC buffer encryption/decryption
  *                 Length should be a multiple of the block
@@ -103,6 +104,7 @@ int aes_crypt_cbc( aes_context *ctx,
                     unsigned char iv[16],
                     const unsigned char *input,
                     unsigned char *output );
+#endif
 
 /**
  * \brief          AES-CFB128 buffer encryption/decryption.

polarssl-0.14.0/include/polarssl/bignum.h

@@ -501,7 +501,7 @@ int mpi_inv_mod( mpi *X, const mpi *A, const mpi *N );
  *                 1 if memory allocation failed,
  *                 POLARSSL_ERR_MPI_NOT_ACCEPTABLE if X is not prime
  */
-int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng );
+int mpi_is_prime( mpi *X, unsigned char (*f_rng)(void *), void *p_rng );
 
 /**
  * \brief          Prime number generation
@@ -517,7 +517,7 @@ int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng );
  *                 POLARSSL_ERR_MPI_BAD_INPUT_DATA if nbits is < 3
  */
 int mpi_gen_prime( mpi *X, int nbits, int dh_flag,
-                   int (*f_rng)(void *), void *p_rng );
+                   unsigned char (*f_rng)(void *), void *p_rng );
 
 /**
  * \brief          Checkup routine

polarssl-0.14.0/include/polarssl/config.h

@@ -86,10 +86,12 @@
  */
 #define POLARSSL_VERSION_C
 
+#ifdef KEYGEN_SUPPORT
 /*
  * Enable the prime-number generation code.
  */
 #define POLARSSL_GENPRIME
+#endif
 
 /*
  * Uncomment this macro to store the AES tables in ROM.

polarssl-0.14.0/include/polarssl/rsa.h

@@ -183,7 +183,7 @@ void rsa_init( rsa_context *ctx,
  * \return         0 if successful, or an POLARSSL_ERR_RSA_XXX error code
  */
 int rsa_gen_key( rsa_context *ctx,
-                 int (*f_rng)(void *),
+                 unsigned char (*f_rng)(void *),
                  void *p_rng,
                  int nbits, int exponent );
 
@@ -258,7 +258,7 @@ int rsa_private( rsa_context *ctx,
  *                 of ctx->N (eg. 128 bytes if RSA-1024 is used).
  */
 int rsa_pkcs1_encrypt( rsa_context *ctx,
-                       int (*f_rng)(void *),
+                       unsigned char (*f_rng)(void *),
                        void *p_rng,
                        int mode, int  ilen,
                        const unsigned char *input,
@@ -330,7 +330,7 @@ int rsa_pkcs1_verify( rsa_context *ctx,
                       int hash_id,
                       int hashlen,
                       const unsigned char *hash,
-                      unsigned char *sig );
+                      const unsigned char *sig );
 
 /**
  * \brief          Free the components of an RSA key

polarssl-0.14.0/library/aes.c

@@ -172,15 +172,15 @@ static const unsigned char FSb[256] =
     V(CB,B0,B0,7B), V(FC,54,54,A8), V(D6,BB,BB,6D), V(3A,16,16,2C)
 
 #define V(a,b,c,d) 0x##a##b##c##d
-static const unsigned long FT0[256] = { FT };
+static const unsigned long FT0[256] __attribute__((section(".sys.0"))) = { FT };
 #undef V
 
 #define V(a,b,c,d) 0x##b##c##d##a
-static const unsigned long FT1[256] = { FT };
+static const unsigned long FT1[256] __attribute__((section(".sys.1"))) = { FT };
 #undef V
 
 #define V(a,b,c,d) 0x##c##d##a##b
-static const unsigned long FT2[256] = { FT };
+static const unsigned long FT2[256] __attribute__((section(".sys.2"))) = { FT };
 #undef V
 
 #define V(a,b,c,d) 0x##d##a##b##c
@@ -753,6 +753,7 @@ int aes_crypt_ecb( aes_context *ctx,
     return( 0 );
 }
 
+#if 0
 /*
  * AES-CBC buffer encryption/decryption
  */
@@ -816,6 +817,7 @@ int aes_crypt_cbc( aes_context *ctx,
 
     return( 0 );
 }
+#endif
 
 /*
  * AES-CFB128 buffer encryption/decryption

polarssl-0.14.0/library/bignum.c

@@ -225,6 +225,7 @@ int mpi_size( const mpi *X )
     return( ( mpi_msb( X ) + 7 ) >> 3 );
 }
 
+#if 0
 /*
  * Convert an ASCII character to digit value
  */
@@ -310,7 +311,6 @@ cleanup:
     return( ret );
 }
 
-#if 0
 /*
  * Helper to write the digits high-order first
  */
@@ -649,7 +649,7 @@ int mpi_cmp_mpi( const mpi *X, const mpi *Y )
         return( 0 );
 
     if( i > j ) return(  X->s );
-    if( j > i ) return( -X->s );
+    if( j > i ) return( -Y->s );
 
     if( X->s > 0 && Y->s < 0 ) return(  1 );
     if( Y->s > 0 && X->s < 0 ) return( -1 );
@@ -1570,8 +1570,6 @@ cleanup:
     return( ret );
 }
 
-#if defined(POLARSSL_GENPRIME)
-
 /*
  * Modular inverse: X = A^-1 mod N  (HAC 14.61 / 14.64)
  */
@@ -1665,6 +1663,8 @@ cleanup:
     return( ret );
 }
 
+#if defined(POLARSSL_GENPRIME)
+
 static const int small_prime[] =
 {
         3,    5,    7,   11,   13,   17,   19,   23,
@@ -1693,7 +1693,7 @@ static const int small_prime[] =
 /*
  * Miller-Rabin primality test  (HAC 4.24)
  */
-int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng )
+int mpi_is_prime( mpi *X, unsigned char (*f_rng)(void *), void *p_rng )
 {
     int ret, i, j, n, s, xs;
     mpi W, R, T, A, RR;
@@ -1755,7 +1755,7 @@ int mpi_is_prime( mpi *X, int (*f_rng)(void *), void *p_rng )
 
         p = (unsigned char *) A.p;
         for( j = 0; j < A.n * ciL; j++ )
-            *p++ = (unsigned char) f_rng( p_rng );
+            *p++ = f_rng( p_rng );
 
         j = mpi_msb( &A ) - mpi_msb( &W );
         MPI_CHK( mpi_shift_r( &A, j + 1 ) );
@@ -1809,7 +1809,7 @@ cleanup:
  * Prime number generation
  */
 int mpi_gen_prime( mpi *X, int nbits, int dh_flag,
-                   int (*f_rng)(void *), void *p_rng )
+                   unsigned char (*f_rng)(void *), void *p_rng )
 {
     int ret, k, n;
     unsigned char *p;
@@ -1827,7 +1827,7 @@ int mpi_gen_prime( mpi *X, int nbits, int dh_flag,
 
     p = (unsigned char *) X->p;
     for( k = 0; k < X->n * ciL; k++ )
-        *p++ = (unsigned char) f_rng( p_rng );
+        *p++ = f_rng( p_rng );
 
     k = mpi_msb( X );
     if( k < nbits ) MPI_CHK( mpi_shift_l( X, nbits - k ) );

polarssl-0.14.0/library/rsa.c

@@ -58,7 +58,7 @@ void rsa_init( rsa_context *ctx,
  * Generate an RSA keypair
  */
 int rsa_gen_key( rsa_context *ctx,
-        int (*f_rng)(void *),
+        unsigned char (*f_rng)(void *),
         void *p_rng,
         int nbits, int exponent )
 {
@@ -101,6 +101,7 @@ int rsa_gen_key( rsa_context *ctx,
     }
     while( mpi_cmp_int( &G, 1 ) != 0 );
 
+#if 0
     /*
      * D  = E^-1 mod ((P-1)*(Q-1))
      * DP = D mod (P - 1)
@@ -111,6 +112,7 @@ int rsa_gen_key( rsa_context *ctx,
     MPI_CHK( mpi_mod_mpi( &ctx->DP, &ctx->D, &P1 ) );
     MPI_CHK( mpi_mod_mpi( &ctx->DQ, &ctx->D, &Q1 ) );
     MPI_CHK( mpi_inv_mod( &ctx->QP, &ctx->Q, &ctx->P ) );
+#endif
 
     ctx->len = ( mpi_msb( &ctx->N ) + 7 ) >> 3;
 
@@ -129,6 +131,7 @@ cleanup:
 
 #endif
 
+#if 0
 /*
  * Check a public RSA key
  */
@@ -197,6 +200,7 @@ cleanup:
     mpi_free( &G, &I, &H, &Q1, &P1, &DE, &PQ, &G2, &L1, &L2, NULL );
     return( POLARSSL_ERR_RSA_KEY_CHECK_FAILED | ret );
 }
+#endif
 
 /*
  * Do an RSA public key operation
@@ -295,7 +299,7 @@ cleanup:
  * Add the message padding, then do an RSA operation
  */
 int rsa_pkcs1_encrypt( rsa_context *ctx,
-                       int (*f_rng)(void *),
+                       unsigned char (*f_rng)(void *),
                        void *p_rng,
                        int mode, int  ilen,
                        const unsigned char *input,
@@ -323,7 +327,7 @@ int rsa_pkcs1_encrypt( rsa_context *ctx,
                 int rng_dl = 100;
 
                 do {
-                    *p = (unsigned char) f_rng( p_rng );
+                    *p = f_rng( p_rng );
                 } while( *p == 0 && --rng_dl );
 
                 // Check if RNG failed to generate data
@@ -538,11 +542,11 @@ int rsa_pkcs1_verify( rsa_context *ctx,
                       int hash_id,
                       int hashlen,
                       const unsigned char *hash,
-                      unsigned char *sig )
+                      const unsigned char *sig )
 {
     int ret, len, siglen;
     unsigned char *p, c;
-    unsigned char buf[1024];
+    unsigned char buf[256];
 
     siglen = ctx->len;
 

regnual/Makefile

@@ -0,0 +1,49 @@
+# Makefile for reGNUal
+
+PROJECT = regnual
+
+OBJS = regnual.o usb_lld.o sys.o
+LDSCRIPT= regnual.ld
+
+###################################
+MCU  = cortex-m3
+
+TRGT = arm-none-eabi-
+CC   = $(TRGT)gcc
+LD   = $(TRGT)ld
+OBJCOPY   = $(TRGT)objcopy
+OBJDUMP   = $(TRGT)objdump
+
+# THUMB-specific options here
+TOPT = -mthumb -DTHUMB -mno-thumb-interwork
+# Define C warning options here
+CWARN = -Wall -Wextra -Wstrict-prototypes
+MCFLAGS= -mcpu=$(MCU) -mfix-cortex-m3-ldrd
+DEFS = -DFREE_STANDING
+
+CFLAGS = -O2 -g
+CFLAGS += $(CWARN) -I . -I ../src -fno-common $(MCFLAGS) $(TOPT) $(DEFS)
+
+LDFLAGS = -T$(LDSCRIPT) -nostartfiles $(MCFLAGS) $(TOPT)
+
+
+####################
+
+all: regnual.hex
+
+regnual.o: regnual.c ../src/sys.h
+
+regnual.hex: regnual.elf
+	$(OBJCOPY) -Obinary regnual.elf regnual.bin
+	$(OBJCOPY) -Oihex regnual.elf regnual.hex
+
+usb_lld.o: ../src/usb_lld.c
+	$(CC) $(CFLAGS) -c -o usb_lld.o ../src/usb_lld.c
+
+regnual.elf: $(OBJS) $(LDSCRIPT)
+	$(CC) $(LDFLAGS) -o regnual.elf $(OBJS)
+
+clean:
+	-rm -f $(OBJS) regnual.elf regnual.hex regnual.bin
+
+distclean: clean

regnual/regnual.c

@@ -0,0 +1,355 @@
+/*
+ * regnual.c -- Firmware installation for STM32F103 Flash ROM
+ *
+ * Copyright (C) 2012 Free Software Initiative of Japan
+ * Author: NIIBE Yutaka <gniibe@fsij.org>
+ *
+ * This file is a part of Gnuk, a GnuPG USB Token implementation.
+ *
+ * Gnuk is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Gnuk is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*
+ * ReGNUal
+ */
+
+#include "types.h"
+#include "usb_lld.h"
+#include "sys.h"
+
+extern void *memset (void *s, int c, size_t n);
+
+extern void set_led (int);
+extern uint8_t _flash_start,  _flash_end;
+extern int flash_write (uint32_t dst_addr, const uint8_t *src, size_t len);
+extern int flash_protect (void);
+extern void nvic_system_reset (void);
+
+
+#define ENDP0_RXADDR        (0x40)
+#define ENDP0_TXADDR        (0x80)
+
+/* USB Standard Device Descriptor */
+static const uint8_t regnual_device_desc[] = {
+  18,   /* bLength */
+  USB_DEVICE_DESCRIPTOR_TYPE,     /* bDescriptorType */
+  0x10, 0x01,   /* bcdUSB = 1.1 */
+  0xFF,   /* bDeviceClass: VENDOR */
+  0x00,   /* bDeviceSubClass */
+  0x00,   /* bDeviceProtocol */
+  0x40,   /* bMaxPacketSize0 */
+#include "../src/usb-vid-pid-ver.c.inc"
+  1, /* Index of string descriptor describing manufacturer */
+  2, /* Index of string descriptor describing product */
+  3, /* Index of string descriptor describing the device's serial number */
+  0x01    /* bNumConfigurations */
+};
+
+static const uint8_t regnual_config_desc[] = {
+  9,
+  USB_CONFIGURATION_DESCRIPTOR_TYPE, /* bDescriptorType: Configuration */
+  18, 0,			/* wTotalLength: no of returned bytes */
+  1,			/* bNumInterfaces: single vender interface */
+  0x01,			/* bConfigurationValue: Configuration value */
+  0x00,			/* iConfiguration: None */
+#if defined(USB_SELF_POWERED)
+  0xC0,				/* bmAttributes: self powered */
+#else
+  0x80,				/* bmAttributes: bus powered */
+#endif
+  50,				/* MaxPower 100 mA */
+
+  /* Interface Descriptor */
+  9,
+  USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
+  0,				 /* bInterfaceNumber: Index of this interface */
+  0,			    /* Alternate setting for this interface */
+  0,			    /* bNumEndpoints: None */
+  0xFF,
+  0,
+  0,
+  0,				/* string index for interface */
+};
+
+static const uint8_t regnual_string_lang_id[] = {
+  4,				/* bLength */
+  USB_STRING_DESCRIPTOR_TYPE,
+  0x09, 0x04			/* LangID = 0x0409: US-English */
+};
+
+#include "../src/usb-strings.c.inc"
+
+static const uint8_t regnual_string_serial[] = {
+  8*2+2,
+  USB_STRING_DESCRIPTOR_TYPE,
+  /* FSIJ-0.0 */
+  'F', 0, 'S', 0, 'I', 0, 'J', 0, '-', 0, 
+  '0', 0, '.', 0, '0', 0,
+};
+
+const struct Descriptor device_desc = {
+  regnual_device_desc,
+  sizeof (regnual_device_desc)
+};
+
+const struct Descriptor config_desc = {
+  regnual_config_desc,
+  sizeof (regnual_config_desc)
+};
+
+const struct Descriptor string_descs[] = {
+  {regnual_string_lang_id, sizeof (regnual_string_lang_id)},
+  {gnukStringVendor, sizeof (gnukStringVendor)},
+  {gnukStringProduct, sizeof (gnukStringProduct)},
+  {regnual_string_serial, sizeof (regnual_string_serial)},
+};
+
+#define NUM_STRING_DESC (sizeof (string_descs)/sizeof (struct Descriptor))
+
+static void
+regnual_device_reset (void)
+{
+  /* Set DEVICE as not configured */
+  usb_lld_set_configuration (0);
+
+  /* Current Feature initialization */
+  usb_lld_set_feature (config_desc.Descriptor[7]);
+
+  usb_lld_reset ();
+
+  /* Initialize Endpoint 0 */
+  usb_lld_setup_endpoint (ENDP0, EP_CONTROL, 0, ENDP0_RXADDR, ENDP0_TXADDR,
+			  64);
+}
+
+#define USB_REGNUAL_MEMINFO	0
+#define USB_REGNUAL_SEND	1
+#define USB_REGNUAL_RESULT	2
+#define USB_REGNUAL_FLASH	3
+#define USB_REGNUAL_PROTECT	4
+#define USB_REGNUAL_FINISH	5
+
+static uint8_t mem[256];
+static uint32_t result;
+
+static const uint8_t *const mem_info[] = { &_flash_start,  &_flash_end, };
+
+
+static uint32_t rbit (uint32_t v)
+{
+  uint32_t r;
+
+  asm ("rbit	%0, %1" : "=r" (r) : "r" (v));
+  return r;
+}
+
+static uint32_t fetch (int i)
+{
+  uint32_t v;
+
+  v = *(uint32_t *)(&mem[i*4]);
+  return rbit (v);
+}
+
+struct CRC {
+  __IO uint32_t DR;
+  __IO uint8_t  IDR;
+  uint8_t   RESERVED0;
+  uint16_t  RESERVED1;
+  __IO uint32_t CR;
+};
+
+#define  CRC_CR_RESET 0x01
+static uint32_t calc_crc32 (void)
+{
+  struct CRC *CRC = (struct CRC *)0x40023000;
+  int i;
+
+  CRC->CR = CRC_CR_RESET;
+
+  for (i = 0; i < 256/4; i++)
+    CRC->DR = fetch (i);
+
+  return rbit (CRC->DR);
+}
+
+
+static void regnual_ctrl_write_finish (uint8_t req, uint8_t req_no,
+				    uint16_t value, uint16_t index,
+				    uint16_t len)
+{
+  uint8_t type_rcp = req & (REQUEST_TYPE|RECIPIENT);
+
+  if (type_rcp == (VENDOR_REQUEST | DEVICE_RECIPIENT) && USB_SETUP_SET (req))
+    {
+      if (req_no == USB_REGNUAL_SEND && value == 0)
+	result = calc_crc32 ();
+      else if (req_no == USB_REGNUAL_FLASH && len == 0 && index == 0)
+	{
+	  uint32_t dst_addr = (0x08000000 + value * 0x100);
+
+	  result = flash_write (dst_addr, mem, 256);
+	}
+      else if (req_no == USB_REGNUAL_PROTECT && len == 0
+	       && value == 0 && index == 0)
+	result = flash_protect ();
+      else if (req_no == USB_REGNUAL_FINISH && len == 0
+	       && value == 0 && index == 0)
+	nvic_system_reset ();
+    }
+}
+
+static int
+regnual_setup (uint8_t req, uint8_t req_no,
+	       uint16_t value, uint16_t index, uint16_t len)
+{
+  uint8_t type_rcp = req & (REQUEST_TYPE|RECIPIENT);
+
+  if (type_rcp == (VENDOR_REQUEST | DEVICE_RECIPIENT))
+    {
+      if (USB_SETUP_GET (req))
+	{
+	  if (req_no == USB_REGNUAL_MEMINFO)
+	    {
+	      usb_lld_set_data_to_send (mem_info, sizeof (mem_info));
+	      return USB_SUCCESS;
+	    }
+	  else if (req_no == USB_REGNUAL_RESULT)
+	    {
+	      usb_lld_set_data_to_send (&result, sizeof (uint32_t));
+	      return USB_SUCCESS;
+	    }
+	}
+      else /* SETUP_SET */
+	{
+	  if (req_no == USB_REGNUAL_SEND)
+	    {
+	      if (value != 0 || index + len > 256)
+		return USB_UNSUPPORT;
+
+	      if (index + len < 256)
+		memset (mem + index + len, 0xff, 256 - (index + len));
+
+	      usb_lld_set_data_to_recv (mem + index, len);
+	      return USB_SUCCESS;
+	    }
+	  else if (req_no == USB_REGNUAL_FLASH && len == 0 && index == 0)
+	    {
+	      uint32_t dst_addr = (0x08000000 + value * 0x100);
+
+	      if (dst_addr + 256 <= (uint32_t)&_flash_end)
+		return USB_SUCCESS;
+	    }
+	  else if (req_no == USB_REGNUAL_PROTECT && len == 0
+		   && value == 0 && index == 0)
+	    return USB_SUCCESS;
+	  else if (req_no == USB_REGNUAL_FINISH && len == 0
+		   && value == 0 && index == 0)
+	    return USB_SUCCESS;
+	}
+    }
+
+  return USB_UNSUPPORT;
+}
+
+static int
+regnual_get_descriptor (uint8_t desc_type, uint16_t index, uint16_t value)
+{
+  (void)index;
+  if (desc_type == DEVICE_DESCRIPTOR)
+    {
+      usb_lld_set_data_to_send (device_desc.Descriptor,
+				device_desc.Descriptor_Size);
+      return USB_SUCCESS;
+    }
+  else if (desc_type == CONFIG_DESCRIPTOR)
+    {
+      usb_lld_set_data_to_send (config_desc.Descriptor,
+				config_desc.Descriptor_Size);
+      return USB_SUCCESS;
+    }
+  else if (desc_type == STRING_DESCRIPTOR)
+    {
+      uint8_t desc_index = value & 0xff;
+
+      if (desc_index < NUM_STRING_DESC)
+	{
+	  usb_lld_set_data_to_send (string_descs[desc_index].Descriptor,
+				    string_descs[desc_index].Descriptor_Size);
+	  return USB_SUCCESS;
+	}
+    }
+
+  return USB_UNSUPPORT;
+}
+
+static int regnual_usb_event (uint8_t event_type, uint16_t value)
+{
+  (void)value;
+
+  switch (event_type)
+    {
+    case USB_EVENT_ADDRESS:
+    case USB_EVENT_CONFIG:
+      return USB_SUCCESS;
+    default:
+      break;
+    }
+
+  return USB_UNSUPPORT;
+}
+
+static int regnual_interface (uint8_t cmd, uint16_t interface, uint16_t alt)
+{
+  (void)cmd; (void)interface; (void)alt;
+  return USB_UNSUPPORT;
+}
+
+const struct usb_device_method Device_Method = {
+  regnual_device_reset,
+  regnual_ctrl_write_finish,
+  regnual_setup,
+  regnual_get_descriptor,
+  regnual_usb_event,
+  regnual_interface,
+};
+
+static void wait (int count)
+{
+  int i;
+
+  for (i = 0; i < count; i++)
+    asm volatile ("" : : "r" (i) : "memory");
+}
+
+#define WAIT 2400000
+
+int
+main (int argc, char *argv[])
+{
+  (void)argc; (void)argv;
+
+  set_led (0);
+
+  usb_lld_init (regnual_config_desc[7]);
+
+  while (1)
+    {
+      set_led (1);
+      wait (WAIT);
+      set_led (0);
+      wait (WAIT);
+    }
+}

regnual/regnual.ld

@@ -0,0 +1,98 @@
+/*
+ * ST32F103 memory setup.
+ */
+__main_stack_size__     = 0x0400;
+__process_stack_size__  = 0x0200;
+__stacks_total_size__   = __main_stack_size__ + __process_stack_size__;
+
+MEMORY
+{
+    ram0 : org = 0x20000000, len = 0x1400
+    ram1 : org = 0x20001400, len = 20k - 0x1400
+}
+
+vector = 0x08000000;
+_flash_start = 0x08001000;
+_flash_end   = 0x08020000;
+
+__ram_start__           = ORIGIN(ram0);
+__ram_size__            = 20k;
+__ram_end__             = __ram_start__ + __ram_size__;
+
+SECTIONS
+{
+    . = 0;
+
+    .bss :
+    {
+        _bss_start = .;
+        *(.bss)
+        . = ALIGN(4);
+        *(.bss.*)
+        . = ALIGN(4);
+        *(COMMON)
+        . = ALIGN(4);
+        _bss_end = .;
+    } > ram0
+
+    .text : ALIGN(16) SUBALIGN(16)
+    {
+        _text = .;
+        KEEP(*(.vectors))
+        *(.text)
+        *(.text.*)
+        *(.rodata)
+        *(.rodata.*)
+        *(.glue_7t)
+        *(.glue_7)
+        *(.gcc*)
+    } > ram1
+
+    .ctors :
+    {
+        PROVIDE(_ctors_start_ = .);
+        KEEP(*(SORT(.ctors.*)))
+        KEEP(*(.ctors))
+        PROVIDE(_ctors_end_ = .);
+    } > ram1
+
+    .dtors :
+    {
+        PROVIDE(_dtors_start_ = .);
+        KEEP(*(SORT(.dtors.*)))
+        KEEP(*(.dtors))
+        PROVIDE(_dtors_end_ = .);
+    } > ram1
+
+    .ARM.extab : {*(.ARM.extab* .gnu.linkonce.armextab.*)}
+
+    __exidx_start = .;
+    .ARM.exidx : {*(.ARM.exidx* .gnu.linkonce.armexidx.*)} > ram1
+    __exidx_end = .;
+
+    .eh_frame_hdr : {*(.eh_frame_hdr)}
+
+    .eh_frame : ONLY_IF_RO {*(.eh_frame)}
+
+    . = ALIGN(4);
+    _etext = .;
+    _textdata = _etext;
+
+    .data :
+    {
+        _data = .;
+        *(.data)
+        . = ALIGN(4);
+        *(.data.*)
+        . = ALIGN(4);
+        *(.ramtext)
+        . = ALIGN(4);
+        _edata = .;
+    } > ram1
+
+    PROVIDE(end = .);
+    _end            = .;
+}
+
+__heap_base__   = _end;
+__heap_end__    = __ram_end__ - __stacks_total_size__;

regnual/sys.c

@@ -0,0 +1,60 @@
+#include "types.h"
+
+static void fatal (void)
+{
+  for (;;);
+}
+
+static void none (void)
+{
+}
+
+/* Note: it is not reset */
+static __attribute__ ((naked))
+void entry (void)
+{
+  asm volatile ("ldr	r0, =__ram_end__\n\t"
+		"ldr	r1, =__main_stack_size__\n\t"
+		"sub	r0, r0, r1\n\t"
+		"mov	sp, r0\n\t"
+		"mov	r0, #0\n\t"
+		"ldr	r1, =_bss_start\n\t"
+		"ldr	r2, =_bss_end\n"
+	"0:\n\t"
+		"str	r0, [r1], #4\n\t"
+		"cmp	r2, r1\n\t"
+		"bhi	0b\n\t"
+		"cpsie	i\n\t"	/* Enable interrupts */
+		"mov	r0, #0\n\t"
+		"mov	r1, r0\n\t"
+		"bl	main\n"
+	"1:\n\t"
+		"b	1b\n"
+		: /* no output */ : /* no input */ : "memory");
+}
+
+typedef void (*handler)(void);
+extern uint8_t __ram_end__;
+extern void usb_interrupt_handler (void);
+
+handler vector_table[] __attribute__ ((section(".vectors"))) = {
+  (handler)&__ram_end__,
+  entry,
+  fatal,		/* nmi */
+  fatal,		/* hard fault */
+  /* 10 */
+  fatal,		/* mem manage */
+  fatal,		/* bus fault */
+  fatal,		/* usage fault */
+  none,
+  /* 20 */
+  none, none, none, none,  none, none, none, none,
+  /* 40 */
+  none, none, none, none,  none, none, none, none,
+  /* 60 */
+  none, none, none, none,  none, none, none, none,
+  /* 80 */
+  none, none, none, none,
+  /* 90 */
+  usb_interrupt_handler,
+};

regnual/types.h

@@ -0,0 +1,12 @@
+typedef unsigned long size_t;
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+
+#define TRUE  1
+#define FALSE 0
+
+#define NULL  0
+
+#define     __IO    volatile

src/Makefile.in

@@ -3,9 +3,6 @@
 BOARD_DIR=@BOARD_DIR@
 @PINPAD_MAKE_OPTION@
 @DEBUG_MAKE_OPTION@
-ifneq ($(ENABLE_DEBUG),)
-ENABLE_VCOMPORT=1
-endif
 
 ##############################################################################
 # Build global options
@@ -70,8 +67,6 @@ include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
-include stmusb.mk
-include vcomport.mk
 include crypt.mk
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
@@ -81,17 +76,14 @@ CSRC = $(PORTSRC) \
        $(HALSRC) \
        $(PLATFORMSRC) \
        $(BOARDSRC) \
-       ../boards/common/hw_config.c \
        $(BOARD_DIR)/board.c \
        $(CHIBIOS)/os/various/evtimer.c \
        $(CHIBIOS)/os/various/syscalls.c \
-       $(STMUSBSRC) \
-       $(VCOMSRC) \
        $(CRYPTSRC) \
        main.c usb_lld.c \
-	usb_desc.c usb_prop.c \
-	usb-icc.c openpgp.c ac.c openpgp-do.c flash.c hardclock.c \
-	random.c neug.c
+	usb_desc.c usb_ctrl.c \
+	usb-icc.c openpgp.c ac.c openpgp-do.c flash.c \
+	random.c neug.c sys.c
 
 ifneq ($(ENABLE_DEBUG),)
 CSRC += debug.c
@@ -102,14 +94,14 @@ CSRC += pin-$(ENABLE_PINPAD).c
 endif
 
 ifeq ($(ENABLE_PINPAD),dnd)
-CSRC += usb_msc.c
+CSRC += usb-msc.c
 endif
 
 # List ASM source files here
 ASMSRC = $(PORTASM) \
          $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors.s
 
-INCDIR = $(CRYPTINCDIR) $(STMUSBINCDIR) $(VCOMDIR) \
+INCDIR = $(CRYPTINCDIR) \
 	 $(PORTINC) $(KERNINC) $(TESTINC) \
          $(HALINC) $(PLATFORMINC) ../boards/common $(BOARD_DIR) \
          $(CHIBIOS)/os/various
@@ -183,7 +175,7 @@ DLIBS =
 #
 
 # List all user C define here, like -D_DEBUG=1
-UDEFS =
+UDEFS = @KEYGEN_SUPPORT@
 
 # Define ASM defines here
 UADEFS =
@@ -201,15 +193,8 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-ifeq ($(USE_FWLIB),yes)
-  include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
-  CSRC += $(STM32SRC)
-  INCDIR += $(STM32INC)
-  USE_OPT += -DUSE_STDPERIPH_DRIVER
-endif
-
 include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
 MCFLAGS= -mcpu=$(MCU) -mfix-cortex-m3-ldrd
 
 distclean: clean
-	-rm -f Makefile gnuk.ld config.h
+	-rm -f Makefile gnuk.ld config.h *.inc

src/ac.c

@@ -1,7 +1,7 @@
 /*
  * ac.c -- Check access condition
  *
- * Copyright (C) 2010 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2012 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -24,9 +24,7 @@
 #include "config.h"
 #include "ch.h"
 #include "gnuk.h"
-
-#include "polarssl/config.h"
-#include "polarssl/sha1.h"
+#include "sha256.h"
 
 uint8_t volatile auth_status;	/* Initialized to AC_NONE_AUTHORIZED */
 
@@ -89,7 +87,7 @@ verify_user_0 (uint8_t access, const uint8_t *pw, int buf_len, int pw_len_known,
     }
 
  success_one_step:
-  sha1 (pw, pw_len, keystring);
+  s2k (BY_USER, pw, pw_len, keystring);
   if (access == AC_PSO_CDS_AUTHORIZED)
     {
       r1 = gpg_do_load_prvkey (GPG_KEY_FOR_SIGNING, BY_USER, keystring);
@@ -161,28 +159,27 @@ static void
 calc_md (int count, const uint8_t *salt, const uint8_t *pw, int pw_len,
 	 uint8_t md[KEYSTRING_MD_SIZE])
 {
-  sha1_context sha1_ctx;
+  sha256_context sha256_ctx;
 
-  sha1_starts (&sha1_ctx);
+  sha256_start (&sha256_ctx);
 
   while (count > pw_len + 8)
     {
-      sha1_update (&sha1_ctx, salt, 8);
-      sha1_update (&sha1_ctx, pw, pw_len);
+      sha256_update (&sha256_ctx, salt, 8);
+      sha256_update (&sha256_ctx, pw, pw_len);
       count -= pw_len + 8;
     }
 
   if (count <= 8)
-    sha1_update (&sha1_ctx, salt, count);
+    sha256_update (&sha256_ctx, salt, count);
   else
     {
-      sha1_update (&sha1_ctx, salt, 8);
+      sha256_update (&sha256_ctx, salt, 8);
       count -= 8;
-      sha1_update (&sha1_ctx, pw, count);
+      sha256_update (&sha256_ctx, pw, count);
     }
 
-  sha1_finish (&sha1_ctx, md);
-  memset (&sha1_ctx, 0, sizeof (sha1_ctx));
+  sha256_finish (&sha256_ctx, md);
 }
 
 uint8_t keystring_md_pw3[KEYSTRING_MD_SIZE];
@@ -205,7 +202,7 @@ verify_admin_0 (const uint8_t *pw, int buf_len, int pw_len_known)
 	return 0;
 
       pw_len = pw3_keystring[0];
-      if ((pw_len_known >= 0 && pw_len_known != pw_len) || pw_len < buf_len)
+      if ((pw_len_known >= 0 && pw_len_known != pw_len) || pw_len > buf_len)
 	goto failure;
 
       salt = &pw3_keystring[1];
@@ -283,7 +280,7 @@ verify_admin (const uint8_t *pw, int pw_len)
   if (r <= 0)
     return r;
 
-  sha1 (pw, pw_len, keystring_md_pw3);
+  s2k (admin_authorized, pw, pw_len, keystring_md_pw3);
   auth_status |= AC_ADMIN_AUTHORIZED;
   return 1;
 }
@@ -293,6 +290,7 @@ ac_reset_admin (void)
 {
   memset (keystring_md_pw3, 0, KEYSTRING_MD_SIZE);
   auth_status &= ~AC_ADMIN_AUTHORIZED;
+  admin_authorized = 0;
 }
 
 void
@@ -303,4 +301,5 @@ ac_fini (void)
   gpg_do_clear_prvkey (GPG_KEY_FOR_DECRYPTION);
   gpg_do_clear_prvkey (GPG_KEY_FOR_AUTHENTICATION);
   auth_status = AC_NONE_AUTHORIZED;
+  admin_authorized = 0;
 }

src/call-rsa.c

@@ -1,7 +1,7 @@
 /*
  * call-rsa.c -- Glue code between RSA computation and OpenPGP card protocol
  *
- * Copyright (C) 2010, 2011 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -47,10 +47,12 @@ rsa_sign (const uint8_t *raw_message, uint8_t *output, int msg_len,
   rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
 
   rsa_ctx.len = KEY_CONTENT_LEN;
-  mpi_read_string (&rsa_ctx.E, 16, "10001");
+  mpi_lset (&rsa_ctx.E, 0x10001);
   mpi_read_binary (&rsa_ctx.P, &kd->data[0], rsa_ctx.len / 2);
   mpi_read_binary (&rsa_ctx.Q, &kd->data[KEY_CONTENT_LEN/2], rsa_ctx.len / 2);
+#if 0 /* Using CRT, we don't use N */
   mpi_mul_mpi (&rsa_ctx.N, &rsa_ctx.P, &rsa_ctx.Q);
+#endif
   mpi_sub_int (&P1, &rsa_ctx.P, 1);
   mpi_sub_int (&Q1, &rsa_ctx.Q, 1);
   mpi_mul_mpi (&H, &P1, &Q1);
@@ -61,17 +63,6 @@ rsa_sign (const uint8_t *raw_message, uint8_t *output, int msg_len,
   mpi_free (&P1, &Q1, &H, NULL);
 
   DEBUG_INFO ("RSA sign...");
-#if 0
-  if ((r = rsa_check_privkey (&rsa_ctx)) == 0)
-    DEBUG_INFO ("ok...");
-  else
-    {
-      DEBUG_INFO ("failed.\r\n");
-      DEBUG_SHORT (r);
-      rsa_free (&rsa_ctx);
-      return r;
-    }
-#endif
 
   r = rsa_pkcs1_sign (&rsa_ctx, RSA_PRIVATE, SIG_RSA_RAW,
 		      msg_len, raw_message, temp);
@@ -138,11 +129,13 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
   rsa_ctx.len = msg_len;
   DEBUG_WORD (msg_len);
 
-  mpi_read_string (&rsa_ctx.E, 16, "10001");
+  mpi_lset (&rsa_ctx.E, 0x10001);
   mpi_read_binary (&rsa_ctx.P, &kd->data[0], KEY_CONTENT_LEN / 2);
   mpi_read_binary (&rsa_ctx.Q, &kd->data[KEY_CONTENT_LEN/2],
 		   KEY_CONTENT_LEN / 2);
+#if 0 /* Using CRT, we don't use N */
   mpi_mul_mpi (&rsa_ctx.N, &rsa_ctx.P, &rsa_ctx.Q);
+#endif
   mpi_sub_int (&P1, &rsa_ctx.P, 1);
   mpi_sub_int (&Q1, &rsa_ctx.Q, 1);
   mpi_mul_mpi (&H, &P1, &Q1);
@@ -153,21 +146,9 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
   mpi_free (&P1, &Q1, &H, NULL);
 
   DEBUG_INFO ("RSA decrypt ...");
-#if 0
-  /* This consume some memory */
-  if ((r = rsa_check_privkey (&rsa_ctx)) == 0)
-    DEBUG_INFO ("ok...");
-  else
-    {
-      DEBUG_INFO ("failed.\r\n");
-      DEBUG_SHORT (r);
-      rsa_free (&rsa_ctx);
-      return r;
-    }
-#endif
 
   r = rsa_pkcs1_decrypt (&rsa_ctx, RSA_PRIVATE, &output_len,
-			 input, output, MAX_RES_APDU_SIZE - 2);
+			 input, output, MAX_RES_APDU_DATA_SIZE);
   rsa_free (&rsa_ctx);
   if (r < 0)
     {
@@ -183,3 +164,65 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
       return 0;
     }
 }
+
+int
+rsa_verify (const uint8_t *pubkey, const uint8_t *hash, const uint8_t *sig)
+{
+  int r;
+
+  rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
+  rsa_ctx.len = KEY_CONTENT_LEN;
+  mpi_lset (&rsa_ctx.E, 0x10001);
+  mpi_read_binary (&rsa_ctx.N, pubkey, KEY_CONTENT_LEN);
+
+  DEBUG_INFO ("RSA verify...");
+
+  r = rsa_pkcs1_verify (&rsa_ctx, RSA_PUBLIC, SIG_RSA_SHA256, 32, hash, sig);
+
+  rsa_free (&rsa_ctx);
+  if (r < 0)
+    {
+      DEBUG_INFO ("fail:");
+      DEBUG_SHORT (r);
+      return r;
+    }
+  else
+    {
+      DEBUG_INFO ("verified.\r\n");
+      return 0;
+    }
+}
+
+#define RSA_EXPONENT 0x10001
+
+#ifdef KEYGEN_SUPPORT
+const uint8_t *
+rsa_genkey (void)
+{
+  int r;
+  uint8_t index = 0;
+  uint8_t *p_q_modulus = (uint8_t *)malloc (KEY_CONTENT_LEN*2);
+  uint8_t *p = p_q_modulus;
+  uint8_t *q = p_q_modulus + KEY_CONTENT_LEN/2;
+  uint8_t *modulus = p_q_modulus + KEY_CONTENT_LEN;
+
+  if (p_q_modulus == NULL)
+    return NULL;
+
+  rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
+  r = rsa_gen_key (&rsa_ctx, random_byte, &index,
+		   KEY_CONTENT_LEN * 8, RSA_EXPONENT);
+  if (r < 0)
+    {
+      free (p_q_modulus);
+      rsa_free (&rsa_ctx);
+      return NULL;
+    }
+
+  mpi_write_binary (&rsa_ctx.P, p, KEY_CONTENT_LEN/2);
+  mpi_write_binary (&rsa_ctx.Q, q, KEY_CONTENT_LEN/2);
+  mpi_write_binary (&rsa_ctx.N, modulus, KEY_CONTENT_LEN);
+  rsa_free (&rsa_ctx);
+  return p_q_modulus;
+}
+#endif

src/config.h.in

@@ -6,3 +6,4 @@
 @PINPAD_DEFINE@
 @PINPAD_MORE_DEFINE@
 @CERTDO_DEFINE@
+#define FLASH_PAGE_SIZE	@FLASH_PAGE_SIZE@

src/configure

@@ -3,7 +3,7 @@
 #
 # This file is *NOT* generated by GNU Autoconf, but written by NIIBE Yutaka
 #
-# Copyright (C) 2010, 2011 Free Software Initiative of Japan
+# Copyright (C) 2010, 2011, 2012 Free Software Initiative of Japan
 #
 # This file is a part of Gnuk, a GnuPG USB Token implementation.
 # Gnuk is free software: you can redistribute it and/or modify it
@@ -21,12 +21,14 @@
 
 # Default settings
 help=no
+vidpid=none
 target=OLIMEX_STM32_H103
 verbose=no
 with_dfu=default
 debug=no
 pinpad=no
 certdo=no
+keygen=no
 
 # Process each option
 for option; do
@@ -38,16 +40,16 @@ for option; do
   case $option in
   -h | --help)
     help=yes ;;
-  --target=*)
-    target=$optarg ;;
   -v | --verbose)
     verbose=yes ;;
+  --vidpid=*)
+    vidpid=$optarg ;;
+  --target=*)
+    target=$optarg ;;
   --enable-debug)
     debug=yes ;;
   --disable-debug)
     debug=no ;;
-  --enable-pinpad)
-    pinpad=yes ;;
   --enable-pinpad=*)
     pinpad=$optarg ;;
   --disable-pinpad)
@@ -56,6 +58,10 @@ for option; do
     certdo=yes ;;
   --disable-certdo)
     certdo=no ;;
+  --enable-keygen)
+    keygen=yes ;;
+  --disable-keygen)
+    keygen=no ;;
   --with-dfu)
     with_dfu=yes ;;
   --without-dfu)
@@ -76,6 +82,7 @@ Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help		display this help and exit	[no]
+  --vidpid=VID:PID	specify vendor/product ID	[<NONE>]
   --target=TARGET	specify target			[OLIMEX_STM32_H103]
 			supported targes are:
 			   OLIMEX_STM32_H103
@@ -84,15 +91,22 @@ Configuration:
 			   STBEE_MINI
 			   STM8S_DISCOVERY
 			   STBEE
+			   FST_01
   --enable-debug	debug with virtual COM port	[no]
-  --enable-pinpad={dnd,cir,dial}
+  --enable-pinpad={cir,dial}
 			PIN entry support		[no]
   --enable-certdo	support CERT.3 data object	[no]
+  --enable-keygen	support key generation		[no]
   --with-dfu		build image for DFU 		[<target specific>]
 EOF
   exit 0
 fi
 
+if test "$vidpid" = "none"; then
+  echo "Please specify Vendor ID and Product ID by --vidpid option." 
+  exit 1
+fi
+
 BOARD_DIR=../boards/$target
 if test -d $BOARD_DIR; then
   echo "Configured for target: $target"
@@ -147,6 +161,7 @@ if test "$with_dfu" = "yes"; then
   FLASH_SIZE=`expr $FLASH_SIZE - 12`
   DFU_DEFINE="#define DFU_SUPPORT 1"
 else
+  with_dfu=no
   echo "Configured for bare system (no-DFU)"
   ORIGIN=0x08000000
   DFU_DEFINE="#undef DFU_SUPPORT"
@@ -158,11 +173,6 @@ if test "$pinpad" = "no"; then
   PINPAD_DEFINE="#undef PINPAD_SUPPORT"
   PINPAD_MORE_DEFINE=""
   echo "PIN pad option disabled"
-elif test "$pinpad" = "yes"; then
-  PINPAD_MAKE_OPTION="ENABLE_PINPAD=dnd"
-  PINPAD_DEFINE="#define PINPAD_SUPPORT 1"
-  PINPAD_MORE_DEFINE="#define PINPAD_DND_SUPPORT 1"
-  echo "PIN pad option enabled (dnd)"
 else
   PINPAD_MAKE_OPTION="ENABLE_PINPAD=$pinpad"
   PINPAD_DEFINE="#define PINPAD_SUPPORT 1"
@@ -173,15 +183,73 @@ fi
 # --enable-certdo option
 if test "$certdo" = "yes"; then
   CERTDO_DEFINE="#define CERTDO_SUPPORT 1"
-  echo "CERT.3 Data Object is supported (Note: it is not supported by GnuPG)"
+  echo "CERT.3 Data Object is supported"
 else
   CERTDO_DEFINE="#undef CERTDO_SUPPORT"
-  echo "CERT.3 Data Object is not supported"
+  echo "CERT.3 Data Object is NOT supported"
+fi
+
+# --enable-keygen option
+if test "$keygen" = "yes"; then
+  KEYGEN_SUPPORT="-DKEYGEN_SUPPORT"
+  echo "Key generation on device is supported"
+else
+  KEYGEN_SUPPORT=""
+  echo "Key generation on device is NOT supported"
+fi
+
+REVISION=`git describe --dirty="-modified"` 
+CONFIG="$target:dfu=$with_dfu:debug=$debug:pinpad=$pinpad:certdo=$certdo:keygen=$keygen"
+
+if !(IFS="	"
+  while read VIDPID VERSION PRODUCT VENDOR; do
+    if test "$vidpid" = "$VIDPID"; then
+      (echo $VIDPID | sed -n -e "s%^\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\):\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\)$%  0x\2, 0x\1, /* idVendor  */\n  0x\4, 0x\3, /* idProduct */%p"
+       echo $VERSION | sed -n -e "s%^\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\)$%  0x\2, 0x\1, /* bcdDevice  */%p"
+      ) > usb-vid-pid-ver.c.inc
+      (echo 'static const uint8_t gnukStringVendor[] = {'
+       echo "  ${#VENDOR}*2+2,			/* bLength */"
+       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+       echo "  /* Manufacturer: \"$VENDOR\" */"
+       echo $VENDOR | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
+       echo '};'
+       echo
+       echo 'static const uint8_t gnukStringProduct[] = {'
+       echo "  ${#PRODUCT}*2+2,			/* bLength */"
+       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+       echo "  /* Product name: \"$PRODUCT\" */"
+       echo $PRODUCT | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
+       echo '};'
+       echo
+       echo '#ifdef USB_STRINGS_FOR_GNUK'
+       echo 'static const uint8_t gnuk_revision_detail[] = {'
+       echo "  ${#REVISION}*2+2,			/* bLength */"
+       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+       echo "  /* revision detail: \"$REVISION\" */"
+       echo $REVISION | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
+       echo '};'
+       echo
+       echo 'static const uint8_t gnuk_config_options[] = {'
+       echo "  ${#CONFIG}*2+2,			/* bLength */"
+       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+       echo "  /* configure options: \"$CONFIG\" */"
+       echo $CONFIG | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
+       echo '};'
+       echo '#endif'
+       ) >usb-strings.c.inc
+      exit 0
+    fi
+  done; exit 1) < ../GNUK_USB_DEVICE_ID
+then
+  echo "Please specify valid Vendor ID and Product ID." 
+  echo "Check ../GNUK_USB_DEVICE_ID."
+  exit 1
 fi
 
 sed -e "s%@BOARD_DIR@%$BOARD_DIR%" \
     -e "s%@DEBUG_MAKE_OPTION@%$DEBUG_MAKE_OPTION%" \
     -e "s%@PINPAD_MAKE_OPTION@%$PINPAD_MAKE_OPTION%" \
+    -e "s%@KEYGEN_SUPPORT@%$KEYGEN_SUPPORT%" \
 	< Makefile.in > Makefile
 if test "$certdo" = "yes"; then
   sed -e "/^@CERTDO_SUPPORT_START@$/ d" -e "/^@CERTDO_SUPPORT_END@$/ d" \
@@ -199,5 +267,6 @@ sed -e "s/@DEBUG_DEFINE@/$DEBUG_DEFINE/" \
     -e "s/@PINPAD_DEFINE@/$PINPAD_DEFINE/" \
     -e "s/@PINPAD_MORE_DEFINE@/$PINPAD_MORE_DEFINE/" \
     -e "s/@CERTDO_DEFINE@/$CERTDO_DEFINE/" \
+    -e "s/@FLASH_PAGE_SIZE@/$FLASH_PAGE_SIZE/" \
 	< config.h.in > config.h
 exit 0

src/crypt.mk

@@ -1,6 +1,6 @@
 CRYPTDIR = ../polarssl-0.14.0
 CRYPTSRCDIR = $(CRYPTDIR)/library
 CRYPTINCDIR = $(CRYPTDIR)/include
-CRYPTSRC = $(CRYPTSRCDIR)/bignum.c $(CRYPTSRCDIR)/rsa.c $(CRYPTSRCDIR)/sha1.c \
+CRYPTSRC = $(CRYPTSRCDIR)/bignum.c $(CRYPTSRCDIR)/rsa.c \
 	$(CRYPTSRCDIR)/aes.c \
-	call-rsa.c
+	sha256.c call-rsa.c

src/flash.c

@@ -1,7 +1,7 @@
 /*
  * flash.c -- Data Objects (DO) and GPG Key handling on Flash ROM
  *
- * Copyright (C) 2010, 2011 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -32,108 +32,9 @@
 #include "config.h"
 #include "ch.h"
 #include "hal.h"
+#include "sys.h"
 #include "gnuk.h"
 
-#define FLASH_KEY1               0x45670123UL
-#define FLASH_KEY2               0xCDEF89ABUL
-
-enum flash_status
-{
-  FLASH_BUSY = 1,
-  FLASH_ERROR_PG,
-  FLASH_ERROR_WRP,
-  FLASH_COMPLETE,
-  FLASH_TIMEOUT
-};
-
-void
-flash_unlock (void)
-{
-  FLASH->KEYR = FLASH_KEY1;
-  FLASH->KEYR = FLASH_KEY2;
-}
-
-static int
-flash_get_status (void)
-{
-  int status;
-
-  if ((FLASH->SR & FLASH_SR_BSY) != 0)
-    status = FLASH_BUSY;
-  else if ((FLASH->SR & FLASH_SR_PGERR) != 0)
-    status = FLASH_ERROR_PG;
-  else if((FLASH->SR & FLASH_SR_WRPRTERR) != 0 )
-    status = FLASH_ERROR_WRP;
-  else
-    status = FLASH_COMPLETE;
-
-  return status;
-}
-
-static int
-flash_wait_for_last_operation (uint32_t timeout)
-{
-  int status;
-
-  do
-    if (--timeout == 0)
-      return FLASH_TIMEOUT;
-    else
-      status = flash_get_status ();
-  while (status == FLASH_BUSY);
-
-  return status;
-}
-
-#define FLASH_PROGRAM_TIMEOUT 0x00010000
-#define FLASH_ERASE_TIMEOUT   0x01000000
-
-static int
-flash_program_halfword (uint32_t addr, uint16_t data)
-{
-  int status;
-
-  status = flash_wait_for_last_operation (FLASH_PROGRAM_TIMEOUT);
-
-  chSysLock ();
-  if (status == FLASH_COMPLETE)
-    {
-      FLASH->CR |= FLASH_CR_PG;
-
-      *(volatile uint16_t *)addr = data;
-
-      status = flash_wait_for_last_operation (FLASH_PROGRAM_TIMEOUT);
-      if (status != FLASH_TIMEOUT)
-	FLASH->CR &= ~FLASH_CR_PG;
-    }
-  chSysUnlock ();
-
-  return status;
-}
-
-static int
-flash_erase_page (uint32_t addr)
-{
-  int status;
-
-  status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
-
-  chSysLock ();
-  if (status == FLASH_COMPLETE)
-    {
-      FLASH->CR |= FLASH_CR_PER;
-      FLASH->AR = addr; 
-      FLASH->CR |= FLASH_CR_STRT;
-
-      status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
-      if (status != FLASH_TIMEOUT)
-	FLASH->CR &= ~FLASH_CR_PER;
-    }
-  chSysUnlock ()
-
-  return status;
-}
-
 /*
  * Flash memory map
  *
@@ -145,7 +46,7 @@ flash_erase_page (uint32_t addr)
  *         .data
  * _bss_start
  *         .bss
- * _end 
+ * _end
  *         <alignment to page>
  * ch_certificate_startp
  *         <2048 bytes>
@@ -154,14 +55,11 @@ flash_erase_page (uint32_t addr)
  * _keystore_pool
  *         1.5-KiB Key store (512-byte (p, q and N) key-store * 3)
  */
+#define KEY_SIZE	512	/* P, Q and N */
+
 #define FLASH_DATA_POOL_HEADER_SIZE	2
-#if defined(STM32F10X_HD)
-#define FLASH_PAGE_SIZE			2048
-#else
-#define FLASH_PAGE_SIZE			1024
-#endif
 #define FLASH_DATA_POOL_SIZE		(FLASH_PAGE_SIZE*2)
-#define FLASH_KEYSTORE_SIZE		(512*3)
+#define FLASH_KEYSTORE_SIZE		(KEY_SIZE*3)
 
 static const uint8_t *data_pool;
 extern uint8_t _keystore_pool;
@@ -200,7 +98,7 @@ flash_init (void)
   /* Seek empty keystore */
   p = &_keystore_pool;
   while (*p != 0xff || *(p+1) != 0xff)
-    p += 512;
+    p += KEY_SIZE;
 
   keystore = p;
 
@@ -294,14 +192,14 @@ flash_do_write_internal (const uint8_t *p, int nr, const uint8_t *data, int len)
 
   addr = (uint32_t)p;
   hw = nr | (len << 8);
-  if (flash_program_halfword (addr, hw) != FLASH_COMPLETE)
+  if (flash_program_halfword (addr, hw) != 0)
     flash_warning ("DO WRITE ERROR");
   addr += 2;
 
   for (i = 0; i < len/2; i++)
     {
       hw = data[i*2] | (data[i*2+1]<<8);
-      if (flash_program_halfword (addr, hw) != FLASH_COMPLETE)
+      if (flash_program_halfword (addr, hw) != 0)
 	flash_warning ("DO WRITE ERROR");
       addr += 2;
     }
@@ -309,9 +207,8 @@ flash_do_write_internal (const uint8_t *p, int nr, const uint8_t *data, int len)
   if ((len & 1))
     {
       hw = data[i*2] | 0xff00;
-      if (flash_program_halfword (addr, hw) != FLASH_COMPLETE)
+      if (flash_program_halfword (addr, hw) != 0)
 	flash_warning ("DO WRITE ERROR");
-      addr += 2;
     }
 }
 
@@ -360,20 +257,19 @@ flash_do_release (const uint8_t *do_data)
   /* Fill zero for content and pad */
   for (i = 0; i < len/2; i ++)
     {
-      if (flash_program_halfword (addr, 0) != FLASH_COMPLETE)
+      if (flash_program_halfword (addr, 0) != 0)
 	flash_warning ("fill-zero failure");
       addr += 2;
     }
 
   if ((len & 1))
     {
-      if (flash_program_halfword (addr, 0) != FLASH_COMPLETE)
+      if (flash_program_halfword (addr, 0) != 0)
 	flash_warning ("fill-zero pad failure");
-      addr += 2;
     }
 
   /* Fill 0x0000 for "tag_number and length" word */
-  if (flash_program_halfword (addr_tag, 0) != FLASH_COMPLETE)
+  if (flash_program_halfword (addr_tag, 0) != 0)
     flash_warning ("fill-zero tag_nr failure");
 }
 
@@ -385,7 +281,7 @@ flash_key_alloc (void)
   if ((k - &_keystore_pool) >= FLASH_KEYSTORE_SIZE)
     return NULL;
 
-  keystore += 512;
+  keystore += KEY_SIZE;
   return k;
 }
 
@@ -401,7 +297,7 @@ flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
   for (i = 0; i < KEY_CONTENT_LEN/2; i ++)
     {
       hw = key_data[i*2] | (key_data[i*2+1]<<8);
-      if (flash_program_halfword (addr, hw) != FLASH_COMPLETE)
+      if (flash_program_halfword (addr, hw) != 0)
 	return -1;
       addr += 2;
     }
@@ -409,7 +305,7 @@ flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
   for (i = 0; i < KEY_CONTENT_LEN/2; i ++)
     {
       hw = modulus[i*2] | (modulus[i*2+1]<<8);
-      if (flash_program_halfword (addr, hw) != FLASH_COMPLETE)
+      if (flash_program_halfword (addr, hw) != 0)
 	return -1;
       addr += 2;
     }
@@ -582,24 +478,9 @@ flash_cnt123_clear (const uint8_t **addr_p)
 
 
 #if defined(CERTDO_SUPPORT)
-static int
-flash_check_blank (const uint8_t *page, int size)
-{
-  const uint8_t *p;
-
-  for (p = page; p < page + size; p++)
-    if (*p != 0xff)
-      return 0;
-
-  return 1;
-}
-#endif
-
-#define FLASH_CH_CERTIFICATE_SIZE 2048
 int
 flash_erase_binary (uint8_t file_id)
 {
-#if defined(CERTDO_SUPPORT)
   if (file_id == FILEID_CH_CERTIFICATE)
     {
       const uint8_t *p = &ch_certificate_start;
@@ -613,12 +494,10 @@ flash_erase_binary (uint8_t file_id)
 
       return 0;
     }
-  else
-#else
-    (void)file_id;
-#endif
-    return -1;
+
+  return -1;
 }
+#endif
 
 
 int
@@ -628,19 +507,23 @@ flash_write_binary (uint8_t file_id, const uint8_t *data,
   uint16_t maxsize;
   const uint8_t *p;
 
-#if defined(CERTDO_SUPPORT)
-  if (file_id == FILEID_CH_CERTIFICATE)
-    {
-      maxsize = FLASH_CH_CERTIFICATE_SIZE;
-      p = &ch_certificate_start;
-    }
-  else
-#endif
   if (file_id == FILEID_SERIAL_NO)
     {
       maxsize = 6;
       p = &openpgpcard_aid[8];
     }
+  else if (file_id >= FILEID_UPDATE_KEY_0 && file_id <= FILEID_UPDATE_KEY_3)
+    {
+      maxsize = KEY_CONTENT_LEN;
+      p = gpg_get_firmware_update_key (file_id - FILEID_UPDATE_KEY_0);
+    }
+#if defined(CERTDO_SUPPORT)
+  else if (file_id == FILEID_CH_CERTIFICATE)
+    {
+      maxsize = FLASH_CH_CERTIFICATE_SIZE;
+      p = &ch_certificate_start;
+    }
+#endif
   else
     return -1;
 
@@ -652,11 +535,14 @@ flash_write_binary (uint8_t file_id, const uint8_t *data,
       uint32_t addr;
       int i;
 
+      if (flash_check_blank (p + offset, len)  == 0)
+	return -1;
+
       addr = (uint32_t)p + offset;
       for (i = 0; i < len/2; i++)
 	{
 	  hw = data[i*2] | (data[i*2+1]<<8);
-	  if (flash_program_halfword (addr, hw) != FLASH_COMPLETE)
+	  if (flash_program_halfword (addr, hw) != 0)
 	    flash_warning ("DO WRITE ERROR");
 	  addr += 2;
 	}

src/gnuk.h

@@ -36,7 +36,7 @@ struct apdu {
   uint8_t *cmd_apdu_head;	/* CLS INS P1 P2 [ internal Lc ] */
   uint8_t *cmd_apdu_data;
   uint16_t cmd_apdu_data_len;	/* Nc, calculated by Lc field */
-  uint32_t expected_res_size;	/* Ne, calculated by Le field */
+  uint16_t expected_res_size;	/* Ne, calculated by Le field */
 
   /* response APDU */
   uint16_t sw;
@@ -55,10 +55,10 @@ extern struct apdu apdu;
 #define EV_VERIFY_CMD_AVAILABLE ((eventmask_t)8)
 #define EV_MODIFY_CMD_AVAILABLE ((eventmask_t)16)
 
-/* maximum cmd apdu data is key import 22+4+128+128 (proc_key_import) */
-#define MAX_CMD_APDU_SIZE (7+282) /* header + data */
-/* maximum res apdu data is public key 5+9+256+2 (gpg_do_public_key) */
-#define MAX_RES_APDU_SIZE ((5+9+256)+2) /* Data + status */
+/* Maximum cmd apdu data is key import 22+4+128+128 (proc_key_import) */
+#define MAX_CMD_APDU_DATA_SIZE (22+4+128+128) /* without header */
+/* Maximum res apdu data is public key 5+9+256 (gpg_do_public_key) */
+#define MAX_RES_APDU_DATA_SIZE (5+9+256) /* without trailer */
 
 #define ICC_MSG_HEADER_SIZE	10
 
@@ -68,13 +68,6 @@ extern struct apdu apdu;
 /* USB buffer size of LL (Low-level): size of single Bulk transaction */
 #define USB_LL_BUF_SIZE 64
 
-/*
- * USB buffer size of USB-ICC driver
- * (Changing this, dwMaxCCIDMessageLength too !!)
- */
-#define USB_BUF_SIZE ((10 + 10 + MAX_CMD_APDU_SIZE + USB_LL_BUF_SIZE - 1) \
-			/ USB_LL_BUF_SIZE * USB_LL_BUF_SIZE)
-
 enum icc_state
 {
   ICC_STATE_START,		/* Initial */
@@ -83,9 +76,12 @@ enum icc_state
   ICC_STATE_EXECUTE,		/* Busy4 */
   ICC_STATE_RECEIVE,		/* APDU Received Partially */
   ICC_STATE_SEND,		/* APDU Sent Partially */
+
+  ICC_STATE_EXITED,		/* ICC Thread Terminated */
+  ICC_STATE_EXEC_REQUESTED,	/* Exec requested */
 };
 
-extern volatile enum icc_state icc_state;
+extern enum icc_state *icc_state_p;
 
 extern volatile uint8_t auth_status;
 #define AC_NONE_AUTHORIZED	0x00
@@ -116,7 +112,7 @@ extern void ac_reset_admin (void);
 extern void ac_fini (void);
 
 
-extern void set_res_apdu (uint8_t sw1, uint8_t sw2);
+extern void set_res_sw (uint8_t sw1, uint8_t sw2);
 extern uint16_t data_objects_number_of_bytes;
 
 extern void gpg_data_scan (const uint8_t *p);
@@ -124,7 +120,9 @@ extern void gpg_data_copy (const uint8_t *p);
 extern void gpg_do_get_data (uint16_t tag, int with_tag);
 extern void gpg_do_put_data (uint16_t tag, const uint8_t *data, int len);
 extern void gpg_do_public_key (uint8_t kk_byte);
+extern void gpg_do_keygen (uint8_t kk_byte);
 
+extern const uint8_t *gpg_get_firmware_update_key (uint8_t keyno);
 
 
 enum kind_of_key {
@@ -133,30 +131,36 @@ enum kind_of_key {
   GPG_KEY_FOR_AUTHENTICATION,
 };
 
-extern void flash_unlock (void);
 extern const uint8_t *flash_init (void);
 extern void flash_do_release (const uint8_t *);
 extern const uint8_t *flash_do_write (uint8_t nr, const uint8_t *data, int len);
 extern uint8_t *flash_key_alloc (void);
+extern int flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
+			    const uint8_t *modulus);
 extern void flash_keystore_release (void);
 extern void flash_set_data_pool_last (const uint8_t *p);
 extern void flash_clear_halfword (uint32_t addr);
 extern void flash_increment_counter (uint8_t counter_tag_nr);
 extern void flash_reset_counter (uint8_t counter_tag_nr);
 
-#define FILEID_CH_CERTIFICATE	0
-#define FILEID_RANDOM		1
-#define FILEID_SERIAL_NO	2
+#define FILEID_SERIAL_NO	0
+#define FILEID_UPDATE_KEY_0	1
+#define FILEID_UPDATE_KEY_1	2
+#define FILEID_UPDATE_KEY_2	3
+#define FILEID_UPDATE_KEY_3	4
+#define FILEID_CH_CERTIFICATE	5
 extern int flash_erase_binary (uint8_t file_id);
 extern int flash_write_binary (uint8_t file_id, const uint8_t *data, uint16_t len, uint16_t offset);
 
+#define FLASH_CH_CERTIFICATE_SIZE 2048
+
 /* Linker set these two symbols */
 extern uint8_t ch_certificate_start;
 extern uint8_t random_bits_start;
 
-#define KEY_MAGIC_LEN 8
 #define KEY_CONTENT_LEN 256	/* p and q */
-#define GNUK_MAGIC "Gnuk KEY"
+#define INITIAL_VECTOR_SIZE 16
+#define DATA_ENCRYPTION_KEY_SIZE 16
 
 /* encrypted data content */
 struct key_data {
@@ -165,22 +169,21 @@ struct key_data {
 
 struct key_data_internal {
   uint8_t data[KEY_CONTENT_LEN]; /* p and q */
-  uint32_t check;
-  uint32_t random;
-  char magic[KEY_MAGIC_LEN];
+  uint8_t checksum[DATA_ENCRYPTION_KEY_SIZE];
 };
 
-#define ADDITIONAL_DATA_SIZE 16
-#define DATA_ENCRYPTION_KEY_SIZE 16
 struct prvkey_data {
   const uint8_t *key_addr;
   /*
-   * CRM: [C]heck, [R]andom, and [M]agic in struct key_data_internal
-   *
+   * IV: Initial Vector
    */
-  uint8_t crm_encrypted[ADDITIONAL_DATA_SIZE];
+  uint8_t iv[INITIAL_VECTOR_SIZE];
   /*
-   * DEK: Data Encryption Key
+   * Checksum
+   */
+  uint8_t checksum_encrypted[DATA_ENCRYPTION_KEY_SIZE];
+  /*
+   * DEK (Data Encryption Key) encrypted
    */
   uint8_t dek_encrypted_1[DATA_ENCRYPTION_KEY_SIZE]; /* For user */
   uint8_t dek_encrypted_2[DATA_ENCRYPTION_KEY_SIZE]; /* For resetcode */
@@ -191,12 +194,14 @@ struct prvkey_data {
 #define BY_RESETCODE	2
 #define BY_ADMIN	3
 
-extern int flash_key_write (uint8_t *key_addr, const uint8_t *key_data, const uint8_t *modulus);
+extern void s2k (int who, const unsigned char *input, unsigned int ilen,
+		 unsigned char output[32]);
+
 
 #define KEYSTRING_PASSLEN_SIZE  1
 #define KEYSTRING_SALT_SIZE     8 /* optional */
 #define KEYSTRING_ITER_SIZE     1 /* optional */
-#define KEYSTRING_MD_SIZE       20
+#define KEYSTRING_MD_SIZE       32
 #define KEYSTRING_SIZE_PW1 (KEYSTRING_PASSLEN_SIZE+KEYSTRING_MD_SIZE)
 #define KEYSTRING_SIZE_RC  (KEYSTRING_PASSLEN_SIZE+KEYSTRING_MD_SIZE)
 #define KEYSTRING_SIZE_PW3 (KEYSTRING_PASSLEN_SIZE+KEYSTRING_SALT_SIZE \
@@ -231,6 +236,9 @@ extern int rsa_sign (const uint8_t *, uint8_t *, int, struct key_data *);
 extern const uint8_t *modulus_calc (const uint8_t *, int);
 extern void modulus_free (const uint8_t *);
 extern int rsa_decrypt (const uint8_t *, uint8_t *, int, struct key_data *);
+extern int rsa_verify (const uint8_t *pubkey, const uint8_t *hash,
+		       const uint8_t *signature);
+extern const uint8_t *rsa_genkey (void);
 
 extern const uint8_t *gpg_do_read_simple (uint8_t);
 extern void gpg_do_write_simple (uint8_t, const uint8_t *, int);
@@ -298,7 +306,7 @@ extern uint8_t admin_authorized;
 /*
  * Representation of Boolean object:
  *   0: No record in flash memory
- *   1: 0xc?00
+ *   1: 0xf000
  */
 #define NR_BOOL_PW1_LIFETIME	0xf0
 /*
@@ -307,7 +315,7 @@ extern uint8_t admin_authorized;
 /* 123-counters: Recorded in flash memory by 2-halfword (4-byte).  */
 /*
  * Representation of 123-counters:
- *   0: No record in flash memory 
+ *   0: No record in flash memory
  *   1: 0xfe?? 0xffff
  *   2: 0xfe?? 0xc3c3
  *   3: 0xfe?? 0x0000
@@ -324,11 +332,11 @@ extern const uint8_t *random_bytes_get (void);
 extern void random_bytes_free (const uint8_t *);
 /* 4-byte salt */
 extern uint32_t get_salt (void);
+/* iterator returning a byta at a time */
+extern uint8_t random_byte (void *arg);
 
 extern uint32_t hardclock (void);
 
-extern void set_led (int);
-
 #define NUM_ALL_PRV_KEYS 3	/* SIG, DEC and AUT */
 
 extern uint8_t pw1_keystring[KEYSTRING_SIZE_PW1];
@@ -356,16 +364,14 @@ extern void flash_bool_write_internal (const uint8_t *p, int nr);
 extern void flash_cnt123_write_internal (const uint8_t *p, int which, int v);
 extern void flash_do_write_internal (const uint8_t *p, int nr, const uint8_t *data, int len);
 
-extern const unsigned char *unique_device_id (void);
 extern const uint8_t gnukStringSerial[];
 
-#define LED_ONESHOT_SHORT ((eventmask_t)1)
-#define LED_ONESHOT_LONG  ((eventmask_t)2)
-#define LED_TWOSHOT       ((eventmask_t)4)
-#define LED_STATUS_MODE   ((eventmask_t)8)
-#define LED_INPUT_MODE   ((eventmask_t)16)
-#define LED_FATAL_MODE   ((eventmask_t)32)
-extern Thread *main_thread;
+#define LED_ONESHOT		((eventmask_t)1)
+#define LED_TWOSHOTS		((eventmask_t)2)
+#define LED_SHOW_STATUS		((eventmask_t)4)
+#define LED_START_COMMAND	((eventmask_t)8)
+#define LED_FINISH_COMMAND	((eventmask_t)16)
+#define LED_FATAL		((eventmask_t)32)
 extern void led_blink (int spec);
 
 #if defined(PINPAD_SUPPORT)
@@ -393,3 +399,5 @@ extern uint8_t pin_input_len;
 extern int pinpad_getline (int msg_code, systime_t timeout);
 
 #endif
+
+extern uint8_t _regnual_start, __heap_end__;

src/gnuk.ld.in

@@ -33,10 +33,15 @@ __stacks_total_size__   = __main_stack_size__ + __process_stack_size__;
 
 MEMORY
 {
-    flash : org = @ORIGIN@, len = @FLASH_SIZE@k
+    flash0 : org = @ORIGIN@, len = 4k
+    flash  : org = @ORIGIN@+0x1000, len = @FLASH_SIZE@k - 4k
     ram : org = 0x20000000, len = 20k
 }
 
+/* __flash_start__: flash ROM start address regardless of DFU_SUPPORT */
+__flash_start__         = 0x08001000;
+__flash_end__		= ORIGIN(flash) + LENGTH(flash);
+
 __ram_start__           = ORIGIN(ram);
 __ram_size__            = LENGTH(ram);
 __ram_end__             = __ram_start__ + __ram_size__;
@@ -45,6 +50,22 @@ SECTIONS
 {
     . = 0;
 
+    .sys : ALIGN(16) SUBALIGN(16)
+    {
+        _sys = .;
+        KEEP(*(.vectors))
+	. = ALIGN(16);
+	*(.sys.version)
+	sys.o(.text)
+	sys.o(.text.*)
+        sys.o(.rodata)
+	sys.o(.rodata.*)
+	. = ALIGN(1024);
+	*(.sys.0)
+	*(.sys.1)
+	*(.sys.2)
+    } > flash0
+
     .text : ALIGN(16) SUBALIGN(16)
     {
         _text = .;
@@ -114,6 +135,8 @@ SECTIONS
 
     PROVIDE(end = .);
     _end            = .;
+    . = ALIGN(512);
+    _regnual_start = .;
 
 @CERTDO_SUPPORT_START@
     .gnuk_ch_certificate :
@@ -128,6 +151,7 @@ SECTIONS
 
     .gnuk_flash :
     {
+        . = ALIGN (@FLASH_PAGE_SIZE@);
 	_data_pool = .;
 	KEEP(*(.gnuk_data))
 	. = ALIGN(@FLASH_PAGE_SIZE@);
@@ -135,6 +159,9 @@ SECTIONS
 	_keystore_pool = .;
 	. += 512*3;
 	. = ALIGN(@FLASH_PAGE_SIZE@);
+	_updatekey_store = .;
+	. += 1024;
+	. = ALIGN(@FLASH_PAGE_SIZE@);
     } > flash =0xffffffff
 }
 

src/hardclock.c

@@ -1,14 +0,0 @@
-#include "config.h"
-#include "ch.h"
-#include "hal.h"
-#include "gnuk.h"
-
-uint32_t
-hardclock (void)
-{
-  uint32_t r = SysTick->VAL;
-
-  DEBUG_INFO ("Random: ");
-  DEBUG_WORD (r);
-  return r;
-}

src/main.c

@@ -1,7 +1,7 @@
 /*
  * main.c - main routine of Gnuk
  *
- * Copyright (C) 2010, 2011 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -22,16 +22,12 @@
  */
 
 #include "config.h"
-
-#include "usb_lib.h"
-
 #include "ch.h"
+#include "hal.h"
+#include "sys.h"
 #include "gnuk.h"
 #include "usb_lld.h"
-#include "usb_istr.h"
-#include "usb_desc.h"
-#include "hw_config.h"
-#include "usb_pwr.h"
+#include "usb-cdc.h"
 
 #ifdef DEBUG
 struct stdout {
@@ -146,6 +142,19 @@ STDOUTthread (void *arg)
   goto again;
   return 0;
 }
+
+void
+EP3_IN_Callback (void)
+{
+  if (stdout_thread)
+    chEvtSignalI (stdout_thread, EV_TX_READY);
+}
+
+void
+EP5_OUT_Callback (void)
+{
+  usb_lld_rx_enable (ENDP5);
+}
 #else
 void
 _write (const char *s, int size)
@@ -161,13 +170,15 @@ extern msg_t USBthread (void *arg);
 /*
  * main thread does 1-bit LED display output
  */
-#define LED_TIMEOUT_INTERVAL	MS2ST(100)
-#define LED_TIMEOUT_ZERO	MS2ST(50)
-#define LED_TIMEOUT_ONE		MS2ST(200)
-#define LED_TIMEOUT_STOP	MS2ST(500)
+#define MAIN_TIMEOUT_INTERVAL	MS2ST(5000)
+
+#define LED_TIMEOUT_INTERVAL	MS2ST(75)
+#define LED_TIMEOUT_ZERO	MS2ST(25)
+#define LED_TIMEOUT_ONE		MS2ST(100)
+#define LED_TIMEOUT_STOP	MS2ST(200)
 
 
-#define ID_OFFSET 12
+#define ID_OFFSET 22
 static void
 device_initialize_once (void)
 {
@@ -185,7 +196,7 @@ device_initialize_once (void)
       for (i = 0; i < 4; i++)
 	{
 	  uint8_t b = u[i];
-	  uint8_t nibble; 
+	  uint8_t nibble;
 
 	  nibble = (b >> 4);
 	  nibble += (nibble >= 10 ? ('A' - 10) : '0');
@@ -199,161 +210,115 @@ device_initialize_once (void)
 
 static volatile uint8_t fatal_code;
 
-Thread *main_thread;
-
-#define GNUK_INIT           0
-#define GNUK_RUNNING        1
-#define GNUK_INPUT_WAIT     2
-#define GNUK_FATAL        255
-/*
- * 0 for initializing
- * 1 for normal mode
- * 2 for input waiting
- * 255 for fatal
- */
-static uint8_t main_mode;
-
-static void display_interaction (void)
-{
-  eventmask_t m;
-
-  while (1)
-    {
-      m = chEvtWaitOne (ALL_EVENTS);
-      set_led (1);
-      switch (m)
-	{
-	case LED_ONESHOT_SHORT:
-	  chThdSleep (MS2ST (100));
-	  break;
-	case LED_ONESHOT_LONG:
-	  chThdSleep (MS2ST (400));
-	  break;
-	case LED_TWOSHOT:
-	  chThdSleep (MS2ST (50));
-	  set_led (0);
-	  chThdSleep (MS2ST (50));
-	  set_led (1);
-	  chThdSleep (MS2ST (50));
-	  break;
-	case LED_STATUS_MODE:
-	  chThdSleep (MS2ST (400));
-	  set_led (0);
-	  return;
-	case LED_FATAL_MODE:
-	  main_mode = GNUK_FATAL;
-	  set_led (0);
-	  return;
-	default:
-	  break;
-	}
-      set_led (0);
-    }
-}
+static Thread *main_thread;
 
 static void display_fatal_code (void)
 {
-  set_led (1);
-  chThdSleep (LED_TIMEOUT_ZERO);
-  set_led (0);
-  chThdSleep (LED_TIMEOUT_INTERVAL);
-  set_led (1);
-  chThdSleep (LED_TIMEOUT_ZERO);
-  set_led (0);
-  chThdSleep (LED_TIMEOUT_INTERVAL);
-  set_led (1);
-  chThdSleep (LED_TIMEOUT_ZERO);
-  set_led (0);
-  chThdSleep (LED_TIMEOUT_STOP);
-  set_led (1);
-  if (fatal_code & 1)
-    chThdSleep (LED_TIMEOUT_ONE);
-  else
-    chThdSleep (LED_TIMEOUT_ZERO);
-  set_led (0);
-  chThdSleep (LED_TIMEOUT_INTERVAL);
-  set_led (1);
-  if (fatal_code & 2)
-    chThdSleep (LED_TIMEOUT_ONE);
-  else
-    chThdSleep (LED_TIMEOUT_ZERO);
-  set_led (0);
-  chThdSleep (LED_TIMEOUT_INTERVAL);
-  set_led (1);
-  chThdSleep (LED_TIMEOUT_STOP);
-  set_led (0);
-  chThdSleep (LED_TIMEOUT_INTERVAL);
-}
-
-static void display_status_code (void)
-{
-  if (icc_state == ICC_STATE_START)
+  while (1)
     {
       set_led (1);
-      chThdSleep (LED_TIMEOUT_ONE);
+      chThdSleep (LED_TIMEOUT_ZERO);
       set_led (0);
-      chThdSleep (LED_TIMEOUT_STOP * 3);
+      chThdSleep (LED_TIMEOUT_INTERVAL);
+      set_led (1);
+      chThdSleep (LED_TIMEOUT_ZERO);
+      set_led (0);
+      chThdSleep (LED_TIMEOUT_INTERVAL);
+      set_led (1);
+      chThdSleep (LED_TIMEOUT_ZERO);
+      set_led (0);
+      chThdSleep (LED_TIMEOUT_STOP);
+      set_led (1);
+      if (fatal_code & 1)
+	chThdSleep (LED_TIMEOUT_ONE);
+      else
+	chThdSleep (LED_TIMEOUT_ZERO);
+      set_led (0);
+      chThdSleep (LED_TIMEOUT_INTERVAL);
+      set_led (1);
+      if (fatal_code & 2)
+	chThdSleep (LED_TIMEOUT_ONE);
+      else
+	chThdSleep (LED_TIMEOUT_ZERO);
+      set_led (0);
+      chThdSleep (LED_TIMEOUT_INTERVAL);
+      set_led (1);
+      chThdSleep (LED_TIMEOUT_STOP);
+      set_led (0);
+      chThdSleep (LED_TIMEOUT_INTERVAL*10);
     }
+}
+
+static uint8_t led_inverted;
+
+static eventmask_t emit_led (int on_time, int off_time)
+{
+  eventmask_t m;
+
+  set_led (!led_inverted);
+  m = chEvtWaitOneTimeout (ALL_EVENTS, on_time);
+  set_led (led_inverted);
+  if (m) return m;
+  if ((m = chEvtWaitOneTimeout (ALL_EVENTS, off_time)))
+    return m;
+  return 0;
+}
+
+static eventmask_t display_status_code (void)
+{
+  enum icc_state icc_state;
+  eventmask_t m;
+
+  if (icc_state_p == NULL)
+    icc_state = ICC_STATE_START;
+  else
+    icc_state = *icc_state_p;
+
+  if (icc_state == ICC_STATE_START)
+    return emit_led (LED_TIMEOUT_ONE, LED_TIMEOUT_STOP);
   else
     /* GPGthread  running */
     {
-      set_led (1);
-      if ((auth_status & AC_ADMIN_AUTHORIZED) != 0)
-	chThdSleep (LED_TIMEOUT_ONE);
-      else
-	chThdSleep (LED_TIMEOUT_ZERO);
-      set_led (0);
-      chThdSleep (LED_TIMEOUT_INTERVAL);
-      set_led (1);
-      if ((auth_status & AC_OTHER_AUTHORIZED) != 0)
-	chThdSleep (LED_TIMEOUT_ONE);
-      else
-	chThdSleep (LED_TIMEOUT_ZERO);
-      set_led (0);
-      chThdSleep (LED_TIMEOUT_INTERVAL);
-      set_led (1);
-      if ((auth_status & AC_PSO_CDS_AUTHORIZED) != 0)
-	chThdSleep (LED_TIMEOUT_ONE);
-      else
-	chThdSleep (LED_TIMEOUT_ZERO);
+      if ((m = emit_led ((auth_status & AC_ADMIN_AUTHORIZED)?
+			  LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO,
+			  LED_TIMEOUT_INTERVAL)))
+	return m;
+      if ((m = emit_led ((auth_status & AC_OTHER_AUTHORIZED)?
+			  LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO,
+			  LED_TIMEOUT_INTERVAL)))
+	return m;
+      if ((m = emit_led ((auth_status & AC_PSO_CDS_AUTHORIZED)?
+			  LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO,
+			  LED_TIMEOUT_INTERVAL)))
+	return m;
 
       if (icc_state == ICC_STATE_WAIT)
 	{
-	  set_led (0);
-	  chThdSleep (LED_TIMEOUT_STOP * 2);
-	}
-      else if (icc_state == ICC_STATE_RECEIVE)
-	{
-	  set_led (0);
-	  chThdSleep (LED_TIMEOUT_INTERVAL);
-	  set_led (1);
-	  chThdSleep (LED_TIMEOUT_ONE);
-	  set_led (0);
-	  chThdSleep (LED_TIMEOUT_STOP);
+	  if ((m = chEvtWaitOneTimeout (ALL_EVENTS, LED_TIMEOUT_STOP * 2)))
+	    return m;
 	}
       else
 	{
-	  set_led (0);
-	  chThdSleep (LED_TIMEOUT_INTERVAL);
-	  set_led (1);
-	  chThdSleep (LED_TIMEOUT_STOP);
-	  set_led (0);
-	  chThdSleep (LED_TIMEOUT_INTERVAL);
+	  if ((m = chEvtWaitOneTimeout (ALL_EVENTS, LED_TIMEOUT_INTERVAL)))
+	    return m;
+
+	  if ((m = emit_led (icc_state == ICC_STATE_RECEIVE?
+			      LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO,
+			      LED_TIMEOUT_STOP)))
+	    return m;
 	}
+
+      return 0;
     }
 }
 
 void
 led_blink (int spec)
 {
-  if (spec == 0)
-    chEvtSignal (main_thread, LED_ONESHOT_SHORT);
-  else if (spec == 1)
-    chEvtSignal (main_thread, LED_ONESHOT_LONG);
-  else
-    chEvtSignal (main_thread, LED_TWOSHOT);
+  chEvtSignal (main_thread, spec);
 }
 
+
 /*
  * Entry point.
  *
@@ -361,9 +326,9 @@ led_blink (int spec)
  *       See the hwinit1_common function.
  */
 int
-main (int argc, char **argv)
+main (int argc, char *argv[])
 {
-  int count = 0;
+  unsigned int count = 0;
 
   (void)argc;
   (void)argv;
@@ -372,10 +337,17 @@ main (int argc, char **argv)
 
   flash_unlock ();
   device_initialize_once ();
-  usb_lld_init ();
-  USB_Init ();
+  usb_lld_init (Config_Descriptor.Descriptor[7]);
   random_init ();
 
+  while (1)
+    {
+      if (bDeviceState != UNCONNECTED)
+	break;
+
+      chThdSleepMilliseconds (250);
+    }
+
 #ifdef DEBUG
   stdout_init ();
 
@@ -393,49 +365,49 @@ main (int argc, char **argv)
   msc_init ();
 #endif
 
+
   while (1)
     {
       eventmask_t m;
 
+      if (icc_state_p != NULL && *icc_state_p == ICC_STATE_EXEC_REQUESTED)
+	break;
+
+      m = chEvtWaitOneTimeout (ALL_EVENTS, MAIN_TIMEOUT_INTERVAL);
+    got_it:
       count++;
-      m = chEvtWaitOneTimeout (ALL_EVENTS, LED_TIMEOUT_INTERVAL);
       switch (m)
 	{
-	case LED_STATUS_MODE:
-	  main_mode = GNUK_RUNNING;
+	case LED_ONESHOT:
+	  if ((m = emit_led (MS2ST (100), MAIN_TIMEOUT_INTERVAL))) goto got_it;
 	  break;
-	case LED_FATAL_MODE:
-	  main_mode = GNUK_FATAL;
+	case LED_TWOSHOTS:
+	  if ((m = emit_led (MS2ST (50), MS2ST (50)))) goto got_it;
+	  if ((m = emit_led (MS2ST (50), MAIN_TIMEOUT_INTERVAL))) goto got_it;
 	  break;
-	case LED_INPUT_MODE:
-	  main_mode = GNUK_INPUT_WAIT;
+	case LED_SHOW_STATUS:
+	  if ((count & 0x07) != 0) continue; /* Display once for eight times */
+	  if ((m = display_status_code ())) goto got_it;
+	  break;
+	case LED_START_COMMAND:
 	  set_led (1);
-	  chThdSleep (MS2ST (400));
+	  led_inverted = 1;
+	  break;
+	case LED_FINISH_COMMAND:
+	  m = chEvtWaitOneTimeout (ALL_EVENTS, LED_TIMEOUT_STOP);
+	  led_inverted = 0;
 	  set_led (0);
+	  if (m)
+	    goto got_it;
 	  break;
-	default:
-	  break;
-	}
-
-      switch (main_mode)
-	{
-	case GNUK_FATAL:
+	case LED_FATAL:
 	  display_fatal_code ();
 	  break;
-	case GNUK_INIT:
-	  set_led (1);
-	  chThdSleep (LED_TIMEOUT_ZERO);
-	  set_led (0);
-	  chThdSleep (LED_TIMEOUT_STOP * 3);
-	  break;
-	case GNUK_INPUT_WAIT:
-	  display_interaction ();
-	  break;
-	case GNUK_RUNNING:
 	default:
-	  display_status_code ();
+	  if ((m = emit_led (LED_TIMEOUT_ZERO, LED_TIMEOUT_STOP)))
+	    goto got_it;
 	  break;
-	}	  
+	}
 
 #ifdef DEBUG_MORE
       if (bDeviceState == CONFIGURED && (count % 10) == 0)
@@ -448,6 +420,41 @@ main (int argc, char **argv)
 #endif
     }
 
+  set_led (1);
+  usb_lld_shutdown ();
+  /* Disable SysTick */
+  SysTick->CTRL = 0;
+  /* Disable all interrupts */
+  port_disable ();
+  /* Set vector */
+  SCB->VTOR = (uint32_t)&_regnual_start;
+#ifdef DFU_SUPPORT
+#define FLASH_SYS_START_ADDR 0x08000000
+#define FLASH_SYS_END_ADDR (0x08000000+0x1000)
+  {
+    extern uint8_t _sys;
+    uint32_t addr;
+    handler *new_vector = (handler *)FLASH_SYS_START_ADDR;
+    void (*func) (void (*)(void)) = (void (*)(void (*)(void)))new_vector[10];
+
+    /* Kill DFU */
+    for (addr = FLASH_SYS_START_ADDR; addr < FLASH_SYS_END_ADDR;
+	 addr += FLASH_PAGE_SIZE)
+      flash_erase_page (addr);
+
+    /* copy system service routines */
+    flash_write (FLASH_SYS_START_ADDR, &_sys, 0x1000);
+
+    /* Leave Gnuk to exec reGNUal */
+    (*func) (*((void (**)(void))(&_regnual_start+4)));
+    for (;;);
+  }
+#else
+  /* Leave Gnuk to exec reGNUal */
+  flash_erase_all_and_exec (*((void (**)(void))(&_regnual_start+4)));
+#endif
+
+  /* Never reached */
   return 0;
 }
 
@@ -455,7 +462,7 @@ void
 fatal (uint8_t code)
 {
   fatal_code = code;
-  chEvtSignal (main_thread, LED_FATAL_MODE);
+  chEvtSignal (main_thread, LED_FATAL);
   _write ("fatal\r\n", 7);
   for (;;);
 }

src/neug.c

@@ -32,15 +32,15 @@ static Thread *rng_thread;
 
 /* Total number of channels to be sampled by a single ADC operation.*/
 #define ADC_GRP1_NUM_CHANNELS   2
- 
+
 /* Depth of the conversion buffer, channels are sampled one time each.*/
 #define ADC_GRP1_BUF_DEPTH      4
- 
+
 /*
  * ADC samples buffer.
  */
 static adcsample_t samp[ADC_GRP1_NUM_CHANNELS * ADC_GRP1_BUF_DEPTH];
- 
+
 static void adccb (adcsample_t *buffer, size_t n);
 
 /*

src/openpgp-do.c

@@ -1,7 +1,7 @@
 /*
  * openpgp-do.c -- OpenPGP card Data Objects (DO) handling
  *
- * Copyright (C) 2010, 2011 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -25,12 +25,12 @@
 
 #include "config.h"
 #include "ch.h"
+#include "sys.h"
 #include "gnuk.h"
 #include "openpgp.h"
 
 #include "polarssl/config.h"
 #include "polarssl/aes.h"
-#include "polarssl/sha1.h"
 
 #define PASSWORD_ERRORS_MAX 3	/* >= errors, it will be locked */
 static const uint8_t *pw_err_counter_p[3];
@@ -77,12 +77,11 @@ uint16_t data_objects_number_of_bytes;
 static const uint8_t historical_bytes[] __attribute__ ((aligned (1))) = {
   10,
   0x00,
-  0x31, 0x80,			/* Full DF name */
+  0x31, 0x84,			/* Full DF name, GET DATA, MF */
   0x73,
-  0x80, 0x01, 0x40,		/* Full DF name */
+  0x80, 0x01, 0x80,		/* Full DF name */
 				/* 1-byte */
-				/* No command chaining */
-				/* Extended Lc and Le */
+				/* Command chaining, No extended Lc and Le */
   0x00, 0x90, 0x00		/* Status info (no life cycle management) */
 };
 
@@ -90,27 +89,24 @@ static const uint8_t historical_bytes[] __attribute__ ((aligned (1))) = {
 static const uint8_t extended_capabilities[] __attribute__ ((aligned (1))) = {
   10,
   0x30,				/*
-				 * No SM, No get challenge,
+				 * No SM,
+				 * No get challenge,
 				 * Key import supported,
 				 * PW status byte can be put,
 				 * No private_use_DO,
 				 * No algo change allowed
 				 */
   0,		  /* Secure Messaging Algorithm: N/A (TDES=0, AES=1) */
-  0x00, 0x00,	  /* Max get challenge */
+  0x00, 0x00,	  /* Max get challenge (0: Get challenge not supported) */
 #ifdef CERTDO_SUPPORT
-  0x07, 0xfe,	  /* max. length of cardholder certificate (2KB - 2)*/
+  0x08, 0x00,	  /* max. length of cardholder certificate (2KiB) */
 #else
   0x00, 0x00,
 #endif
-  /* Max. length of command data */
-  (MAX_CMD_APDU_SIZE>>8), (MAX_CMD_APDU_SIZE&0xff),
-  /* Max. length of response data */
-#ifdef CERTDO_SUPPORT
-  0x08, 0x00,		     /* the case of cardholder ceritificate */
-#else
-  (MAX_RES_APDU_SIZE>>8), (MAX_RES_APDU_SIZE&0xff),
-#endif
+  /* Max. length of command APDU data */
+  0x00, 0xff,
+  /* Max. length of response APDU data */
+  0x01, 0x00,
 };
 
 /* Algorithm Attributes */
@@ -166,6 +162,17 @@ gpg_write_digital_signature_counter (const uint8_t *p, uint32_t dsc)
     }
 }
 
+static void
+gpg_reset_digital_signature_counter (void)
+{
+  if (digital_signature_counter != 0)
+    {
+      flash_put_data (NR_COUNTER_DS);
+      flash_put_data (NR_COUNTER_DS_LSB);
+      digital_signature_counter = 0;
+    }
+}
+
 void
 gpg_increment_digital_signature_counter (void)
 {
@@ -535,7 +542,7 @@ proc_resetting_code (const uint8_t *data, int len)
 
   newpw_len = len;
   newpw = data;
-  sha1 (newpw, newpw_len, new_ks);
+  s2k (BY_RESETCODE, newpw, newpw_len, new_ks);
   new_ks0[0] = newpw_len;
   r = gpg_change_keystring (admin_authorized, old_ks, BY_RESETCODE, new_ks);
   if (r <= -2)
@@ -564,40 +571,58 @@ proc_resetting_code (const uint8_t *data, int len)
 }
 
 static void
-encrypt (const uint8_t *key_str, uint8_t *data, int len)
+encrypt (const uint8_t *key, const uint8_t *iv, uint8_t *data, int len)
 {
   aes_context aes;
-  uint8_t iv[16];
+  uint8_t iv0[INITIAL_VECTOR_SIZE];
   int iv_offset;
 
   DEBUG_INFO ("ENC\r\n");
   DEBUG_BINARY (data, len);
 
-  aes_setkey_enc (&aes, key_str, 128);
-  memset (iv, 0, 16);
+  aes_setkey_enc (&aes, key, 128);
+  memcpy (iv0, iv, INITIAL_VECTOR_SIZE);
   iv_offset = 0;
-  aes_crypt_cfb128 (&aes, AES_ENCRYPT, len, &iv_offset, iv, data, data);
+  aes_crypt_cfb128 (&aes, AES_ENCRYPT, len, &iv_offset, iv0, data, data);
 }
 
 /* Signing, Decryption, and Authentication */
 struct key_data kd[3];
 
 static void
-decrypt (const uint8_t *key_str, uint8_t *data, int len)
+decrypt (const uint8_t *key, const uint8_t *iv, uint8_t *data, int len)
 {
   aes_context aes;
-  uint8_t iv[16];
+  uint8_t iv0[INITIAL_VECTOR_SIZE];
   int iv_offset;
 
-  aes_setkey_enc (&aes, key_str, 128);
-  memset (iv, 0, 16);
+  aes_setkey_enc (&aes, key, 128); /* This is setkey_enc, because of CFB.  */
+  memcpy (iv0, iv, INITIAL_VECTOR_SIZE);
   iv_offset = 0;
-  aes_crypt_cfb128 (&aes, AES_DECRYPT, len, &iv_offset, iv, data, data);
+  aes_crypt_cfb128 (&aes, AES_DECRYPT, len, &iv_offset, iv0, data, data);
 
   DEBUG_INFO ("DEC\r\n");
   DEBUG_BINARY (data, len);
 }
 
+static void
+encrypt_dek (const uint8_t *key_string, uint8_t *dek)
+{
+  aes_context aes;
+
+  aes_setkey_enc (&aes, key_string, 128);
+  aes_crypt_ecb (&aes, AES_ENCRYPT, dek, dek);
+}
+
+static void
+decrypt_dek (const uint8_t *key_string, uint8_t *dek)
+{
+  aes_context aes;
+
+  aes_setkey_dec (&aes, key_string, 128);
+  aes_crypt_ecb (&aes, AES_DECRYPT, dek, dek);
+}
+
 static uint8_t
 get_do_ptr_nr_for_kk (enum kind_of_key kk)
 {
@@ -619,6 +644,25 @@ gpg_do_clear_prvkey (enum kind_of_key kk)
   memset ((void *)&kd[kk], 0, sizeof (struct key_data));
 }
 
+
+static int
+compute_key_data_checksum (struct key_data_internal *kdi, int check_or_calc)
+{
+  unsigned int i;
+  uint32_t d[4] = { 0, 0, 0, 0 };
+
+  for (i = 0; i < KEY_CONTENT_LEN / sizeof (uint32_t); i++)
+    d[i&3] ^= *(uint32_t *)(&kdi->data[i*4]);
+
+  if (check_or_calc == 0)	/* store */
+    {
+      memcpy (kdi->checksum, d, DATA_ENCRYPTION_KEY_SIZE);
+      return 0;
+    }
+  else				/* check */
+    return memcmp (kdi->checksum, d, DATA_ENCRYPTION_KEY_SIZE) == 0;
+}
+
 /*
  * Return  1 on success,
  *         0 if none,
@@ -629,8 +673,9 @@ gpg_do_load_prvkey (enum kind_of_key kk, int who, const uint8_t *keystring)
 {
   uint8_t nr = get_do_ptr_nr_for_kk (kk);
   const uint8_t *do_data = do_ptr[nr - NR_DO__FIRST__];
-  uint8_t *key_addr;
+  const uint8_t *key_addr;
   uint8_t dek[DATA_ENCRYPTION_KEY_SIZE];
+  const uint8_t *iv;
   struct key_data_internal kdi;
 
   DEBUG_INFO ("Loading private key: ");
@@ -639,60 +684,47 @@ gpg_do_load_prvkey (enum kind_of_key kk, int who, const uint8_t *keystring)
   if (do_data == NULL)
     return 0;
 
-  key_addr = *(uint8_t **)&(do_data)[1];
+  key_addr = *(const uint8_t **)&(do_data)[1]; /* Possible unaligned access */
   memcpy (kdi.data, key_addr, KEY_CONTENT_LEN);
-  memcpy (((uint8_t *)&kdi.check), do_data+5, ADDITIONAL_DATA_SIZE);
+  iv = do_data+5;
+  memcpy (kdi.checksum, iv + INITIAL_VECTOR_SIZE, DATA_ENCRYPTION_KEY_SIZE);
 
-  memcpy (dek, do_data+5+16*who, DATA_ENCRYPTION_KEY_SIZE);
-  decrypt (keystring, dek, DATA_ENCRYPTION_KEY_SIZE);
+  memcpy (dek, do_data+5+16*(who+1), DATA_ENCRYPTION_KEY_SIZE);
+  decrypt_dek (keystring, dek);
 
-  decrypt (dek, (uint8_t *)&kdi, sizeof (struct key_data_internal));
-  if (memcmp (kdi.magic, GNUK_MAGIC, KEY_MAGIC_LEN) != 0)
+  decrypt (dek, iv, (uint8_t *)&kdi, sizeof (struct key_data_internal));
+  memset (dek, 0, DATA_ENCRYPTION_KEY_SIZE);
+  if (!compute_key_data_checksum (&kdi, 1))
     {
       DEBUG_INFO ("gpg_do_load_prvkey failed.\r\n");
       return -1;
     }
-  /* more sanity check??? */
 
   memcpy (kd[kk].data, kdi.data, KEY_CONTENT_LEN);
   DEBUG_BINARY (&kd[kk], KEY_CONTENT_LEN);
   return 1;
 }
 
-static uint32_t
-calc_check32 (const uint8_t *p, int len)
-{
-  uint32_t check = 0;
-  uint32_t *data = (uint32_t *)p;
-  int i;
-
-  for (i = 0; i < len/4; i++)
-    check += data[i];
-
-  return check;
-}
 
 static int8_t num_prv_keys;
 
 static int
 gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
-		     const uint8_t *keystring_admin)
+		     const uint8_t *keystring_admin, const uint8_t *modulus)
 {
   uint8_t nr = get_do_ptr_nr_for_kk (kk);
   const uint8_t *p;
   int r;
-  const uint8_t *modulus;
   struct prvkey_data *pd;
   uint8_t *key_addr;
-  const uint8_t *dek;
+  const uint8_t *dek, *iv;
   const uint8_t *do_data = do_ptr[nr - NR_DO__FIRST__];
   const uint8_t *ks_pw1;
   const uint8_t *ks_rc;
   struct key_data_internal kdi;
-
-#if 0
-  assert (key_len == KEY_CONTENT_LEN);
-#endif
+  int modulus_allocated_here = 0;
+  uint8_t ks_pw1_len = 0;
+  uint8_t ks_rc_len = 0;
 
   DEBUG_INFO ("Key import\r\n");
   DEBUG_SHORT (key_len);
@@ -701,15 +733,23 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
     /* No replace support, you need to remove it first.  */
     return -1;
 
+  if (key_len != KEY_CONTENT_LEN)
+    return -1;
+
   pd = (struct prvkey_data *)malloc (sizeof (struct prvkey_data));
   if (pd == NULL)
     return -1;
 
-  modulus = modulus_calc (key_data, key_len);
   if (modulus == NULL)
     {
-      free (pd);
-      return -1;
+      modulus = modulus_calc (key_data, key_len);
+      if (modulus == NULL)
+	{
+	  free (pd);
+	  return -1;
+	}
+
+      modulus_allocated_here = 1;
     }
 
   DEBUG_INFO ("Getting keystore address...\r\n");
@@ -717,7 +757,8 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
   if (key_addr == NULL)
     {
       free (pd);
-      modulus_free (modulus);
+      if (modulus_allocated_here)
+	modulus_free (modulus);
       return -1;
     }
 
@@ -725,21 +766,21 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
   DEBUG_WORD ((uint32_t)key_addr);
 
   memcpy (kdi.data, key_data, KEY_CONTENT_LEN);
-  kdi.check = calc_check32 (key_data, KEY_CONTENT_LEN);
-  kdi.random = get_salt ();
-  memcpy (kdi.magic, GNUK_MAGIC, KEY_MAGIC_LEN);
+  compute_key_data_checksum (&kdi, 0);
 
-  dek = random_bytes_get (); /* 16-byte random bytes */
+  dek = random_bytes_get (); /* 32-byte random bytes */
+  iv = dek + DATA_ENCRYPTION_KEY_SIZE;
   memcpy (pd->dek_encrypted_1, dek, DATA_ENCRYPTION_KEY_SIZE);
   memcpy (pd->dek_encrypted_2, dek, DATA_ENCRYPTION_KEY_SIZE);
   memcpy (pd->dek_encrypted_3, dek, DATA_ENCRYPTION_KEY_SIZE);
   ks_pw1 = gpg_do_read_simple (NR_DO_KEYSTRING_PW1);
   ks_rc = gpg_do_read_simple (NR_DO_KEYSTRING_RC);
 
-  encrypt (dek, (uint8_t *)&kdi, sizeof (struct key_data_internal));
+  encrypt (dek, iv, (uint8_t *)&kdi, sizeof (struct key_data_internal));
 
   r = flash_key_write (key_addr, kdi.data, modulus);
-  modulus_free (modulus);
+  if (modulus_allocated_here)
+    modulus_free (modulus);
 
   if (r < 0)
     {
@@ -749,32 +790,33 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
     }
 
   pd->key_addr = key_addr;
-  memcpy (pd->crm_encrypted, (uint8_t *)&kdi.check, ADDITIONAL_DATA_SIZE);
-
-  if (kk == GPG_KEY_FOR_SIGNING)
-    ac_reset_pso_cds ();
-  else
-    ac_reset_other ();
+  memcpy (pd->iv, iv, INITIAL_VECTOR_SIZE);
+  memcpy (pd->checksum_encrypted, kdi.checksum, DATA_ENCRYPTION_KEY_SIZE);
 
   if (ks_pw1)
-    encrypt (ks_pw1+1, pd->dek_encrypted_1, DATA_ENCRYPTION_KEY_SIZE);
+    {
+      ks_pw1_len = ks_pw1[0];
+      encrypt_dek (ks_pw1+1, pd->dek_encrypted_1);
+    }
   else
     {
-      uint8_t ks123_pw1[KEYSTRING_SIZE_PW1];
+      uint8_t ks[KEYSTRING_MD_SIZE];
 
-      ks123_pw1[0] = strlen (OPENPGP_CARD_INITIAL_PW1);
-      sha1 ((uint8_t *)OPENPGP_CARD_INITIAL_PW1, 
-	    strlen (OPENPGP_CARD_INITIAL_PW1), ks123_pw1+1);
-      encrypt (ks123_pw1+1, pd->dek_encrypted_1, DATA_ENCRYPTION_KEY_SIZE);
+      s2k (BY_USER, (const uint8_t *)OPENPGP_CARD_INITIAL_PW1,
+	   strlen (OPENPGP_CARD_INITIAL_PW1), ks);
+      encrypt_dek (ks, pd->dek_encrypted_1);
     }
 
   if (ks_rc)
-    encrypt (ks_rc+1, pd->dek_encrypted_2, DATA_ENCRYPTION_KEY_SIZE);
+    {
+      ks_rc_len = ks_rc[0];
+      encrypt_dek (ks_rc+1, pd->dek_encrypted_2);
+    }
   else
     memset (pd->dek_encrypted_2, 0, DATA_ENCRYPTION_KEY_SIZE);
 
   if (keystring_admin)
-    encrypt (keystring_admin, pd->dek_encrypted_3, DATA_ENCRYPTION_KEY_SIZE);
+    encrypt_dek (keystring_admin, pd->dek_encrypted_3);
   else
     memset (pd->dek_encrypted_3, 0, DATA_ENCRYPTION_KEY_SIZE);
 
@@ -789,17 +831,11 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len,
   if (++num_prv_keys == NUM_ALL_PRV_KEYS) /* All keys are registered.  */
     {
       /* Remove contents of keystrings from DO, but length */
-      if (ks_pw1)
-	{
-	  uint8_t ks_pw1_len = ks_pw1[0];
-	  gpg_do_write_simple (NR_DO_KEYSTRING_PW1, &ks_pw1_len, 1);
-	}
+      if (ks_pw1_len)
+	gpg_do_write_simple (NR_DO_KEYSTRING_PW1, &ks_pw1_len, 1);
 
-      if (ks_rc)
-	{
-	  uint8_t ks_rc_len = ks_rc[0];
-	  gpg_do_write_simple (NR_DO_KEYSTRING_RC, &ks_rc_len, 1);
-	}
+      if (ks_rc_len)
+	gpg_do_write_simple (NR_DO_KEYSTRING_RC, &ks_rc_len, 1);
     }
 
   return 0;
@@ -824,19 +860,21 @@ gpg_do_chks_prvkey (enum kind_of_key kk,
   if (pd == NULL)
     return -1;
 
-  memcpy (pd, &(do_data)[1], sizeof (struct prvkey_data));
-  dek_p = ((uint8_t *)pd) + 4 + ADDITIONAL_DATA_SIZE
-    + DATA_ENCRYPTION_KEY_SIZE * (who_old - 1);
+  memcpy (pd, &do_data[1], sizeof (struct prvkey_data));
+  flash_do_release (do_data);
+
+  dek_p = ((uint8_t *)pd) + 4 + INITIAL_VECTOR_SIZE
+    + DATA_ENCRYPTION_KEY_SIZE * who_old;
   memcpy (dek, dek_p, DATA_ENCRYPTION_KEY_SIZE);
-  decrypt (old_ks, dek, DATA_ENCRYPTION_KEY_SIZE);
-  encrypt (new_ks, dek, DATA_ENCRYPTION_KEY_SIZE);
+  decrypt_dek (old_ks, dek);
+  encrypt_dek (new_ks, dek);
   dek_p += DATA_ENCRYPTION_KEY_SIZE * (who_new - who_old);
   memcpy (dek_p, dek, DATA_ENCRYPTION_KEY_SIZE);
 
+  do_ptr[nr - NR_DO__FIRST__] = NULL;
   p = flash_do_write (nr, (const uint8_t *)pd, sizeof (struct prvkey_data));
   do_ptr[nr - NR_DO__FIRST__] = p;
 
-  flash_do_release (do_data);
   free (pd);
   if (p == NULL)
     return -1;
@@ -845,13 +883,13 @@ gpg_do_chks_prvkey (enum kind_of_key kk,
 }
 
 /*
- * 4d, xx, xx:    Extended Header List
+ * 4d, xx, xx, xx:    Extended Header List
  *   b6 00 (SIG) / b8 00 (DEC) / a4 00 (AUT)
  *   7f48, xx: cardholder private key template
  *       91 xx
- *       92 xx
- *       93 xx
- *   5f48, xx: cardholder private key
+ *       92 xx xx
+ *       93 xx xx
+ *   5f48, xx xx xx: cardholder private key
  */
 static int
 proc_key_import (const uint8_t *data, int len)
@@ -859,6 +897,7 @@ proc_key_import (const uint8_t *data, int len)
   int r;
   enum kind_of_key kk;
   const uint8_t *keystring_admin;
+  const uint8_t *p = data;
 
   if (admin_authorized == BY_ADMIN)
     keystring_admin = keystring_md_pw3;
@@ -867,12 +906,31 @@ proc_key_import (const uint8_t *data, int len)
 
   DEBUG_BINARY (data, len);
 
-  if (data[4] == 0xb6)
-    kk = GPG_KEY_FOR_SIGNING;
-  else if (data[4] == 0xb8)
-    kk = GPG_KEY_FOR_DECRYPTION;
-  else				/* 0xa4 */
-    kk = GPG_KEY_FOR_AUTHENTICATION;
+  if (*p++ != 0x4d)
+    return 0;
+
+  /* length field */
+  if (*p == 0x82)
+    p += 3;
+  else if (*p == 0x81)
+    p += 2;
+  else
+    p += 1;
+
+  if (*p == 0xb6)
+    {
+      kk = GPG_KEY_FOR_SIGNING;
+      ac_reset_pso_cds ();
+      gpg_reset_digital_signature_counter ();
+    }
+  else
+    {
+      if (*p == 0xb8)
+	kk = GPG_KEY_FOR_DECRYPTION;
+      else				/* 0xa4 */
+	kk = GPG_KEY_FOR_AUTHENTICATION;
+      ac_reset_other ();
+    }
 
   if (len <= 22)
     {					    /* Deletion of the key */
@@ -892,6 +950,11 @@ proc_key_import (const uint8_t *data, int len)
 	  /* Delete PW1 and RC if any */
 	  gpg_do_write_simple (NR_DO_KEYSTRING_PW1, NULL, 0);
 	  gpg_do_write_simple (NR_DO_KEYSTRING_RC, NULL, 0);
+
+	  ac_reset_pso_cds ();
+	  ac_reset_other ();
+	  if (admin_authorized == BY_USER)
+	    ac_reset_admin ();
 	}
 
       return 1;
@@ -899,7 +962,7 @@ proc_key_import (const uint8_t *data, int len)
 
   /* It should starts with 00 01 00 01 (E) */
   /* Skip E, 4-byte */
-  r = gpg_do_write_prvkey (kk, &data[26], len - 26, keystring_admin);
+  r = gpg_do_write_prvkey (kk, &data[26], len - 26, keystring_admin, NULL);
   if (r < 0)
     return 0;
   else
@@ -980,7 +1043,7 @@ gpg_do_table[] = {
 			     / sizeof (struct do_table_entry))
 
 /*
- * Reading data from Flash ROM, initialize DO_PTR, PW_ERR_COUNTERS, etc. 
+ * Reading data from Flash ROM, initialize DO_PTR, PW_ERR_COUNTERS, etc.
  */
 void
 gpg_data_scan (const uint8_t *p_start)
@@ -1030,18 +1093,18 @@ gpg_data_scan (const uint8_t *p_start)
 	    }
 	  else
 	    switch (nr)
-	    {
-	    case NR_BOOL_PW1_LIFETIME:
-	      pw1_lifetime_p = p - 1;
-	      p++;
-	      continue;
-	    case NR_COUNTER_123:
-	      p++;
-	      if (second_byte <= PW_ERR_PW3)
-		pw_err_counter_p[second_byte] = p;
-	      p += 2;
-	      break;
-	    }
+	      {
+	      case NR_BOOL_PW1_LIFETIME:
+		pw1_lifetime_p = p - 1;
+		p++;
+		continue;
+	      case NR_COUNTER_123:
+		p++;
+		if (second_byte <= PW_ERR_PW3)
+		  pw_err_counter_p[second_byte] = p;
+		p += 2;
+		break;
+	      }
 	}
     }
 
@@ -1228,8 +1291,8 @@ copy_do (const struct do_table_entry *do_p, int with_tag)
       }
     case DO_PROC_READWRITE:
       {
-	int (*rw_func)(uint16_t, int, uint8_t *, int, int)
-	  = (int (*)(uint16_t, int, uint8_t *, int, int))do_p->obj;
+	int (*rw_func)(uint16_t, int, const uint8_t *, int, int)
+	  = (int (*)(uint16_t, int, const uint8_t *, int, int))do_p->obj;
 
 	return rw_func (do_p->tag, with_tag, NULL, 0, 0);
       }
@@ -1330,6 +1393,7 @@ gpg_do_put_data (uint16_t tag, const uint8_t *data, int len)
 		  GPG_MEMORY_FAILURE ();
 		else
 		  {
+		    *do_data_p = NULL;
 		    *do_data_p = flash_do_write (nr, data, len);
 		    if (*do_data_p)
 		      GPG_SUCCESS ();
@@ -1444,6 +1508,7 @@ gpg_do_write_simple (uint8_t nr, const uint8_t *data, int size)
 
   if (data != NULL)
     {
+      *do_data_p = NULL;
       *do_data_p = flash_do_write (nr, data, size);
       if (*do_data_p == NULL)
 	flash_warning ("DO WRITE ERROR");
@@ -1451,3 +1516,78 @@ gpg_do_write_simple (uint8_t nr, const uint8_t *data, int size)
   else
     *do_data_p = NULL;
 }
+
+#ifdef KEYGEN_SUPPORT
+void
+gpg_do_keygen (uint8_t kk_byte)
+{
+  enum kind_of_key kk;
+  const uint8_t *keystring_admin;
+  const uint8_t *p_q_modulus;
+  const uint8_t *p_q;
+  const uint8_t *modulus;
+  int r;
+
+  DEBUG_INFO ("Keygen\r\n");
+  DEBUG_BYTE (kk_byte);
+
+  if (kk_byte == 0xb6)
+    kk = GPG_KEY_FOR_SIGNING;
+  else if (kk_byte == 0xb8)
+    kk = GPG_KEY_FOR_DECRYPTION;
+  else				/* 0xa4 */
+    kk = GPG_KEY_FOR_AUTHENTICATION;
+
+  if (admin_authorized == BY_ADMIN)
+    keystring_admin = keystring_md_pw3;
+  else
+    keystring_admin = NULL;
+
+  p_q_modulus = rsa_genkey ();
+  if (p_q_modulus == NULL)
+    {
+      GPG_MEMORY_FAILURE ();
+      return;
+    }
+
+  p_q = p_q_modulus;
+  modulus = p_q_modulus + KEY_CONTENT_LEN;
+
+  r = gpg_do_write_prvkey (kk, p_q, KEY_CONTENT_LEN,
+			   keystring_admin, modulus);
+  free ((uint8_t *)p_q_modulus);
+  if (r < 0)
+    {
+      GPG_ERROR ();
+      return;
+    }
+
+  DEBUG_INFO ("Calling gpg_do_public_key...\r\n");
+
+  if (kk == GPG_KEY_FOR_SIGNING)
+    {
+      const uint8_t *ks_pw1 = gpg_do_read_simple (NR_DO_KEYSTRING_PW1);
+      uint8_t keystring[KEYSTRING_MD_SIZE];
+      const uint8_t *ks;
+
+      /* GnuPG expects it's ready for signing. */
+      /* Don't call ac_reset_pso_cds here, but load the private key */
+
+      if (ks_pw1)
+	ks = ks_pw1+1;
+      else
+	{
+	  const uint8_t * pw = (const uint8_t *)OPENPGP_CARD_INITIAL_PW1;
+
+	  s2k (BY_USER, pw, strlen (OPENPGP_CARD_INITIAL_PW1), keystring);
+	  ks = keystring;
+	}
+
+      gpg_do_load_prvkey (GPG_KEY_FOR_SIGNING, BY_USER, ks);
+    }
+  else
+    ac_reset_other ();
+
+  gpg_do_public_key (kk_byte);
+}
+#endif

src/openpgp.c

@@ -1,7 +1,7 @@
 /*
  * openpgp.c -- OpenPGP card protocol support
  *
- * Copyright (C) 2010, 2011 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -25,9 +25,9 @@
 #include "ch.h"
 #include "hal.h"
 #include "gnuk.h"
+#include "sys.h"
 #include "openpgp.h"
-#include "polarssl/config.h"
-#include "polarssl/sha1.h"
+#include "sha256.h"
 
 #define CLS(a) a.cmd_apdu_head[0]
 #define INS(a) a.cmd_apdu_head[1]
@@ -39,6 +39,8 @@
 #define INS_PSO		  			0x2a
 #define INS_RESET_RETRY_COUNTER			0x2c
 #define INS_PGP_GENERATE_ASYMMETRIC_KEY_PAIR	0x47
+#define INS_EXTERNAL_AUTHENTICATE		0x82
+#define INS_GET_CHALLENGE			0x84
 #define INS_INTERNAL_AUTHENTICATE		0x88
 #define INS_SELECT_FILE				0xa4
 #define INS_READ_BINARY				0xb0
@@ -48,6 +50,9 @@
 #define INS_PUT_DATA				0xda
 #define INS_PUT_DATA_ODD			0xdb	/* For key import */
 
+#define CHALLENGE_LEN	32
+static const uint8_t *challenge; /* Random bytes */
+
 static const uint8_t
 select_file_TOP_result[] __attribute__ ((aligned (1))) = {
   0x00, 0x00,	     /* unused */
@@ -67,7 +72,7 @@ select_file_TOP_result[] __attribute__ ((aligned (1))) = {
 };
 
 void
-set_res_apdu (uint8_t sw1, uint8_t sw2)
+set_res_sw (uint8_t sw1, uint8_t sw2)
 {
   apdu.sw = (sw1 << 8) | sw2;
 }
@@ -76,9 +81,12 @@ set_res_apdu (uint8_t sw1, uint8_t sw2)
 #define FILE_DF_OPENPGP	1
 #define FILE_MF		2
 #define FILE_EF_DIR	3
-#define FILE_EF_SERIAL	4
-#define FILE_EF_CH_CERTIFICATE  5
-#define FILE_EF_RANDOM		6
+#define FILE_EF_SERIAL_NO	4
+#define FILE_EF_UPDATE_KEY_0	5
+#define FILE_EF_UPDATE_KEY_1	6
+#define FILE_EF_UPDATE_KEY_2	7
+#define FILE_EF_UPDATE_KEY_3	8
+#define FILE_EF_CH_CERTIFICATE	9
 
 static uint8_t file_selection;
 
@@ -99,7 +107,7 @@ gpg_fini (void)
 }
 
 #if defined(PINPAD_SUPPORT)
-/* 
+/*
  * Let user input PIN string.
  * Return length of the string.
  * The string itself is in PIN_INPUT_BUFFER.
@@ -109,9 +117,9 @@ get_pinpad_input (int msg_code)
 {
   int r;
 
-  chEvtSignal (main_thread, LED_INPUT_MODE);
+  led_blink (LED_START_COMMAND);
   r = pinpad_getline (msg_code, MS2ST (8000));
-  chEvtSignal (main_thread, LED_STATUS_MODE);
+  led_blink (LED_FINISH_COMMAND);
   return r;
 }
 #endif
@@ -212,10 +220,10 @@ cmd_change_password (void)
   uint8_t p1 = P1 (apdu);	/* 0: change (old+new), 1: exchange (new) */
   uint8_t p2 = P2 (apdu);
   int len;
-  const uint8_t *pw;
-  const uint8_t *newpw;
+  uint8_t *pw, *newpw;
   int pw_len, newpw_len;
   int who = p2 - 0x80;
+  int who_old;
   int r;
 
   DEBUG_INFO ("Change PW\r\n");
@@ -235,6 +243,7 @@ cmd_change_password (void)
       const uint8_t *ks_pw1 = gpg_do_read_simple (NR_DO_KEYSTRING_PW1);
 
       pw_len = verify_user_0 (AC_PSO_CDS_AUTHORIZED, pw, len, -1, ks_pw1);
+      who_old = who;
 
       if (pw_len < 0)
 	{
@@ -274,15 +283,23 @@ cmd_change_password (void)
 	{
 	  newpw = pw + pw_len;
 	  newpw_len = len - pw_len;
-	  gpg_set_pw3 (newpw, newpw_len);
+	  if (newpw_len == 0 && admin_authorized == BY_ADMIN)
+	    {
+	      newpw_len = strlen (OPENPGP_CARD_INITIAL_PW3);
+	      memcpy (newpw, OPENPGP_CARD_INITIAL_PW3, newpw_len);
+	      gpg_do_write_simple (NR_DO_KEYSTRING_PW3, NULL, 0);
+	    }
+	  else
+	    gpg_set_pw3 (newpw, newpw_len);
+	  who_old = admin_authorized;
 	}
     }
 
-  sha1 (pw, pw_len, old_ks);
-  sha1 (newpw, newpw_len, new_ks);
+  s2k (who_old, pw, pw_len, old_ks);
+  s2k (who, newpw, newpw_len, new_ks);
   new_ks0[0] = newpw_len;
 
-  r = gpg_change_keystring (who, old_ks, who, new_ks);
+  r = gpg_change_keystring (who_old, old_ks, who, new_ks);
   if (r <= -2)
     {
       DEBUG_INFO ("memory error.\r\n");
@@ -298,6 +315,8 @@ cmd_change_password (void)
       gpg_do_write_simple (NR_DO_KEYSTRING_PW1, new_ks0, KEYSTRING_SIZE_PW1);
       ac_reset_pso_cds ();
       ac_reset_other ();
+      if (admin_authorized == BY_USER)
+	ac_reset_admin ();
       DEBUG_INFO ("Changed DO_KEYSTRING_PW1.\r\n");
       GPG_SUCCESS ();
     }
@@ -306,6 +325,8 @@ cmd_change_password (void)
       gpg_do_write_simple (NR_DO_KEYSTRING_PW1, new_ks0, 1);
       ac_reset_pso_cds ();
       ac_reset_other ();
+      if (admin_authorized == BY_USER)
+	ac_reset_admin ();
       DEBUG_INFO ("Changed length of DO_KEYSTRING_PW1.\r\n");
       GPG_SUCCESS ();
     }
@@ -317,6 +338,29 @@ cmd_change_password (void)
     }
 }
 
+
+#define USER_S2K_MAGIC	"\xffUSER\r\n"
+#define RESETCODE_S2K_MAGIC "\xffRESET\r\n"
+
+void
+s2k (int who, const unsigned char *input, unsigned int ilen,
+     unsigned char output[32])
+{
+  sha256_context ctx;
+
+  sha256_start (&ctx);
+  sha256_update (&ctx, input, ilen);
+  if (who == BY_USER)
+    sha256_update (&ctx, (unsigned char *)USER_S2K_MAGIC,
+		   sizeof (USER_S2K_MAGIC));
+  else if (who == BY_RESETCODE)
+    sha256_update (&ctx, (unsigned char *)RESETCODE_S2K_MAGIC,
+		   sizeof (RESETCODE_S2K_MAGIC));
+  /* Not add any for BY_ADMIN */
+  sha256_finish (&ctx, output);
+}
+
+
 static void
 cmd_reset_user_password (void)
 {
@@ -357,8 +401,8 @@ cmd_reset_user_password (void)
       pw_len = ks_rc[0];
       newpw = pw + pw_len;
       newpw_len = len - pw_len;
-      sha1 (pw, pw_len, old_ks);
-      sha1 (newpw, newpw_len, new_ks);
+      s2k (BY_RESETCODE, pw, pw_len, old_ks);
+      s2k (BY_USER, newpw, newpw_len, new_ks);
       new_ks0[0] = newpw_len;
       r = gpg_change_keystring (BY_RESETCODE, old_ks, BY_USER, new_ks);
       if (r <= -2)
@@ -382,6 +426,8 @@ cmd_reset_user_password (void)
 			       KEYSTRING_SIZE_PW1);
 	  ac_reset_pso_cds ();
 	  ac_reset_other ();
+	  if (admin_authorized == BY_USER)
+	    ac_reset_admin ();
 	  gpg_pw_reset_err_counter (PW_ERR_RC);
 	  gpg_pw_reset_err_counter (PW_ERR_PW1);
 	  GPG_SUCCESS ();
@@ -389,8 +435,11 @@ cmd_reset_user_password (void)
       else
 	{
 	  DEBUG_INFO ("done.\r\n");
+	  gpg_do_write_simple (NR_DO_KEYSTRING_PW1, new_ks0, 1);
 	  ac_reset_pso_cds ();
 	  ac_reset_other ();
+	  if (admin_authorized == BY_USER)
+	    ac_reset_admin ();
 	  gpg_pw_reset_err_counter (PW_ERR_RC);
 	  gpg_pw_reset_err_counter (PW_ERR_PW1);
 	  GPG_SUCCESS ();
@@ -409,7 +458,7 @@ cmd_reset_user_password (void)
 
       newpw_len = len;
       newpw = pw;
-      sha1 (newpw, newpw_len, new_ks);
+      s2k (BY_USER, newpw, newpw_len, new_ks);
       new_ks0[0] = newpw_len;
       r = gpg_change_keystring (admin_authorized, old_ks, BY_USER, new_ks);
       if (r <= -2)
@@ -429,14 +478,19 @@ cmd_reset_user_password (void)
 			       KEYSTRING_SIZE_PW1);
 	  ac_reset_pso_cds ();
 	  ac_reset_other ();
+	  if (admin_authorized == BY_USER)
+	    ac_reset_admin ();
 	  gpg_pw_reset_err_counter (PW_ERR_PW1);
 	  GPG_SUCCESS ();
 	}
       else
 	{
 	  DEBUG_INFO ("done.\r\n");
+	  gpg_do_write_simple (NR_DO_KEYSTRING_PW1, new_ks0, 1);
 	  ac_reset_pso_cds ();
 	  ac_reset_other ();
+	  if (admin_authorized == BY_USER)
+	    ac_reset_admin ();
 	  gpg_pw_reset_err_counter (PW_ERR_PW1);
 	  GPG_SUCCESS ();
 	}
@@ -471,32 +525,107 @@ cmd_pgp_gakp (void)
     /* Get public key */
     gpg_do_public_key (apdu.cmd_apdu_data[0]);
   else
-    {					/* Generate key pair */
+    {
       if (!ac_check_status (AC_ADMIN_AUTHORIZED))
 	GPG_SECURITY_FAILURE ();
-
-      /* XXX: Not yet supported */
-      GPG_ERROR ();
+#ifdef KEYGEN_SUPPORT
+      /* Generate key pair */
+      gpg_do_keygen (apdu.cmd_apdu_data[0]);
+#else
+      GPG_FUNCTION_NOT_SUPPORTED ();
+#endif
     }
 }
 
+const uint8_t *
+gpg_get_firmware_update_key (uint8_t keyno)
+{
+  extern uint8_t _updatekey_store;
+  const uint8_t *p;
+
+  p = &_updatekey_store + keyno * KEY_CONTENT_LEN;
+  return p;
+}
+
+#ifdef CERTDO_SUPPORT
+#define FILEID_CH_CERTIFICATE_IS_VALID 1
+#else
+#define FILEID_CH_CERTIFICATE_IS_VALID 0
+#endif
+
 static void
 cmd_read_binary (void)
 {
+  int is_short_EF = (P1 (apdu) & 0x80) != 0;
+  uint8_t file_id;
+  const uint8_t *p;
+  uint16_t offset;
+
   DEBUG_INFO (" - Read binary\r\n");
 
-  if (file_selection == FILE_EF_SERIAL)
+  if (is_short_EF)
+    file_id = (P1 (apdu) & 0x1f);
+  else
+    file_id = file_selection - FILE_EF_SERIAL_NO + FILEID_SERIAL_NO;
+
+  if ((!FILEID_CH_CERTIFICATE_IS_VALID && file_id == FILEID_CH_CERTIFICATE)
+      || file_id > FILEID_CH_CERTIFICATE)
     {
-      if (P2 (apdu) >= 6)
-	GPG_BAD_P0_P1 ();
-      else
-	{
-	  gpg_do_get_data (0x004f, 1); /* AID */
-	  res_APDU[0] = 0x5a;
-	}
+      GPG_NO_FILE ();
+      return;
+    }
+
+  if (is_short_EF)
+    {
+      file_selection = file_id - FILEID_SERIAL_NO + FILE_EF_SERIAL_NO;
+      offset = P2 (apdu);
     }
   else
-    GPG_NO_RECORD();
+    offset = (P1 (apdu) << 8) | P2 (apdu);
+
+  if (file_id == FILEID_SERIAL_NO)
+    {
+      if (offset != 0)
+	GPG_BAD_P1_P2 ();
+      else
+	{
+	  gpg_do_get_data (0x004f, 1); /* Get AID... */
+	  res_APDU[0] = 0x5a; /* ... and overwrite the first byte of data. */
+	}
+      return;
+    }
+
+  if (file_id >= FILEID_UPDATE_KEY_0 && file_id <= FILEID_UPDATE_KEY_3)
+    {
+      if (offset != 0)
+	GPG_MEMORY_FAILURE ();
+      else
+	{
+	  p = gpg_get_firmware_update_key (file_id - FILEID_UPDATE_KEY_0);
+	  res_APDU_size = KEY_CONTENT_LEN;
+	  memcpy (res_APDU, p, KEY_CONTENT_LEN);
+	  GPG_SUCCESS ();
+	}
+    }
+#if defined(CERTDO_SUPPORT)
+  else /* file_id == FILEID_CH_CERTIFICATE */
+    {
+      uint16_t len = 256;
+
+      p = &ch_certificate_start;
+      if (offset >= FLASH_CH_CERTIFICATE_SIZE)
+	GPG_MEMORY_FAILURE ();
+      else
+	{
+	  if (offset + len >= FLASH_CH_CERTIFICATE_SIZE)
+	    len = FLASH_CH_CERTIFICATE_SIZE - offset;
+
+	  res_APDU_size = len;
+	  memcpy (res_APDU, p + offset, len);
+	  GPG_SUCCESS ();
+	}
+    }
+#endif
 }
 
 static void
@@ -510,7 +639,7 @@ cmd_select_file (void)
       if (apdu.cmd_apdu_data_len != 6
 	  || memcmp (openpgpcard_aid, apdu.cmd_apdu_data, 6) != 0)
 	{
-	  DEBUG_WORD (apdu.cmd_apdu_data_len);
+	  DEBUG_SHORT (apdu.cmd_apdu_data_len);
 	  DEBUG_BINARY (apdu.cmd_apdu_data, apdu.cmd_apdu_data_len);
 
 	  GPG_NO_FILE ();
@@ -528,6 +657,7 @@ cmd_select_file (void)
 	  res_APDU[1] = 0x12;
 	  res_APDU[2] = 0x84;	/* overwrite: DF name */
 	  res_APDU_size += 2;
+	  GPG_SUCCESS ();
 	}
     }
   else if (apdu.cmd_apdu_data_len == 2
@@ -538,7 +668,7 @@ cmd_select_file (void)
        * MF.EF-GDO -- Serial number of the card and name of the owner
        */
       GPG_SUCCESS ();
-      file_selection = FILE_EF_SERIAL;
+      file_selection = FILE_EF_SERIAL_NO;
     }
   else if (apdu.cmd_apdu_data_len == 2
 	   && apdu.cmd_apdu_data[0] == 0x3f && apdu.cmd_apdu_data[1] == 0x00)
@@ -646,10 +776,15 @@ cmd_pso (void)
 
       /* Skip padding 0x00 */
       len--;
-      r = rsa_decrypt (apdu.cmd_apdu_data+1, res_APDU, len,
-		       &kd[GPG_KEY_FOR_DECRYPTION]);
-      if (r < 0)
-	GPG_ERROR ();
+      if (len != KEY_CONTENT_LEN)
+	GPG_CONDITION_NOT_SATISFIED ();
+      else
+	{
+	  r = rsa_decrypt (apdu.cmd_apdu_data+1, res_APDU, len,
+			   &kd[GPG_KEY_FOR_DECRYPTION]);
+	  if (r < 0)
+	    GPG_ERROR ();
+	}
     }
   else
     {
@@ -663,6 +798,8 @@ cmd_pso (void)
   DEBUG_INFO ("PSO done.\r\n");
 }
 
+
+#define MAX_DIGEST_INFO_LEN 102 /* 40% */
 static void
 cmd_internal_authenticate (void)
 {
@@ -682,6 +819,13 @@ cmd_internal_authenticate (void)
 	  return;
 	}
 
+      if (len > MAX_DIGEST_INFO_LEN)
+	{
+	  DEBUG_INFO ("input is too long.");
+	  GPG_CONDITION_NOT_SATISFIED ();
+	  return;
+	}
+
       r = rsa_sign (apdu.cmd_apdu_data, res_APDU, len,
 		    &kd[GPG_KEY_FOR_AUTHENTICATION]);
       if (r < 0)
@@ -699,16 +843,17 @@ cmd_internal_authenticate (void)
   DEBUG_INFO ("INTERNAL AUTHENTICATE done.\r\n");
 }
 
+#define MBD_OPRATION_WRITE  0
+#define MBD_OPRATION_UPDATE 1
 
 static void
-cmd_update_binary (void)
+modify_binary (uint8_t op, uint8_t p1, uint8_t p2, int len)
 {
-  int len = apdu.cmd_apdu_data_len;
+  uint8_t file_id;
   uint16_t offset;
+  int is_short_EF = (p1 & 0x80) != 0;
   int r;
 
-  DEBUG_INFO (" - UPDATE BINARY\r\n");
-
   if (!ac_check_status (AC_ADMIN_AUTHORIZED))
     {
       DEBUG_INFO ("security error.");
@@ -716,42 +861,52 @@ cmd_update_binary (void)
       return;
     }
 
-  if ((P1 (apdu) & 0x80))
-    if ((P1 (apdu) & 0x7f) <= FILEID_RANDOM)
-      {
-	file_selection = FILE_EF_CH_CERTIFICATE + (P1 (apdu) & 0x7f);
-	r = flash_erase_binary (file_selection - FILE_EF_CH_CERTIFICATE);
-	if (r < 0)
-	  {
-	    DEBUG_INFO ("memory error.\r\n");
-	    GPG_MEMORY_FAILURE ();
-	    return;
-	  }
-
-	offset = 0;
-      }
-    else
-      {
-	GPG_NO_FILE ();
-	return;
-      }
+  if (is_short_EF)
+    file_id = (p1 & 0x1f);
   else
-    {
-      if (file_selection != FILE_EF_CH_CERTIFICATE
-	  && file_selection != FILE_EF_RANDOM)
-	{
-	  GPG_COMMAND_NOT_ALLOWED ();
-	  return;
-	}
+    file_id = file_selection - FILE_EF_SERIAL_NO + FILEID_SERIAL_NO;
 
-      offset = (P1 (apdu) << 8) | P2 (apdu);
+  if (!FILEID_CH_CERTIFICATE_IS_VALID && file_id == FILEID_CH_CERTIFICATE)
+    {
+      GPG_NO_FILE ();
+      return;
     }
 
+  if (op == MBD_OPRATION_UPDATE && file_id != FILEID_CH_CERTIFICATE)
+    {
+      GPG_CONDITION_NOT_SATISFIED ();
+      return;
+    }
+
+  if (file_id > FILEID_CH_CERTIFICATE)
+    {
+      GPG_NO_FILE ();
+      return;
+    }
+
+  if (is_short_EF)
+    {
+      file_selection = file_id - FILEID_SERIAL_NO + FILE_EF_SERIAL_NO;
+      offset = p2;
+
+      if (op == MBD_OPRATION_UPDATE)
+	{
+	  r = flash_erase_binary (file_id);
+	  if (r < 0)
+	    {
+	      DEBUG_INFO ("memory error.\r\n");
+	      GPG_MEMORY_FAILURE ();
+	      return;
+	    }
+	}
+    }
+  else
+    offset = (p1 << 8) | p2;
+
   DEBUG_SHORT (len);
   DEBUG_SHORT (offset);
 
-  r = flash_write_binary (file_selection - FILE_EF_CH_CERTIFICATE,
-			  apdu.cmd_apdu_data, len, offset);
+  r = flash_write_binary (file_id, apdu.cmd_apdu_data, len, offset);
   if (r < 0)
     {
       DEBUG_INFO ("memory error.\r\n");
@@ -760,64 +915,103 @@ cmd_update_binary (void)
     }
 
   GPG_SUCCESS ();
+}
+
+
+#if defined(CERTDO_SUPPORT)
+static void
+cmd_update_binary (void)
+{
+  int len = apdu.cmd_apdu_data_len;
+
+  DEBUG_INFO (" - UPDATE BINARY\r\n");
+  modify_binary (MBD_OPRATION_UPDATE, P1 (apdu), P2 (apdu), len);
   DEBUG_INFO ("UPDATE BINARY done.\r\n");
 }
+#endif
 
 
 static void
 cmd_write_binary (void)
 {
   int len = apdu.cmd_apdu_data_len;
-  uint16_t offset;
-  int r;
+  int i;
+  const uint8_t *p;
 
   DEBUG_INFO (" - WRITE BINARY\r\n");
+  modify_binary (MBD_OPRATION_WRITE, P1 (apdu), P2 (apdu), len);
 
-  if (!ac_check_status (AC_ADMIN_AUTHORIZED))
+  for (i = 0; i < 4; i++)
+    {
+      p = gpg_get_firmware_update_key (i);
+      if (p[0] != 0x00 || p[1] != 0x00) /* still valid */
+	break;
+    }
+
+  if (i == 4)			/* all update keys are removed */
+    {
+      p = gpg_get_firmware_update_key (0);
+      flash_erase_page ((uint32_t)p);
+    }
+
+  DEBUG_INFO ("WRITE BINARY done.\r\n");
+}
+
+
+static void
+cmd_external_authenticate (void)
+{
+  const uint8_t *pubkey;
+  const uint8_t *signature = apdu.cmd_apdu_data;
+  int len = apdu.cmd_apdu_data_len;
+  uint8_t keyno = P2 (apdu);
+  int r;
+
+  DEBUG_INFO (" - EXTERNAL AUTHENTICATE\r\n");
+
+  if (keyno > 4)
+    {
+      GPG_CONDITION_NOT_SATISFIED ();
+      return;
+    }
+
+  pubkey = gpg_get_firmware_update_key (keyno);
+  if (len != 256
+      || (pubkey[0] == 0xff && pubkey[1] == 0xff) /* not registered */
+      || (pubkey[0] == 0x00 && pubkey[1] == 0x00) /* removed */)
+    {
+      GPG_CONDITION_NOT_SATISFIED ();
+      return;
+    }
+
+  r = rsa_verify (pubkey, challenge, signature);
+  random_bytes_free (challenge);
+  challenge = NULL;
+
+  if (r < 0)
     {
-      DEBUG_INFO ("security error.");
       GPG_SECURITY_FAILURE ();
       return;
     }
 
-  if ((P1 (apdu) & 0x80))
-    if ((P1 (apdu) & 0x7f) <= FILEID_SERIAL_NO)
-      {
-	file_selection = FILE_EF_CH_CERTIFICATE + (P1 (apdu) & 0x7f);
-	offset = 0;
-      }
-    else
-      {
-	GPG_NO_FILE ();
-	return;
-      }
-  else
-    {
-      if (file_selection != FILE_EF_CH_CERTIFICATE
-	  && file_selection != FILE_EF_RANDOM
-	  && file_selection != FILE_EF_SERIAL)
-	{
-	  GPG_COMMAND_NOT_ALLOWED ();
-	  return;
-	}
+  chThdTerminate (chThdSelf ());
+  set_res_sw (0xff, 0xff);
+  DEBUG_INFO ("EXTERNAL AUTHENTICATE done.\r\n");
+}
 
-      offset = (P1 (apdu) << 8) | P2 (apdu);
-    }
+static void
+cmd_get_challenge (void)
+{
+  DEBUG_INFO (" - GET CHALLENGE\r\n");
 
-  DEBUG_SHORT (len);
-  DEBUG_SHORT (offset);
-
-  r = flash_write_binary (file_selection - FILE_EF_CH_CERTIFICATE,
-			  apdu.cmd_apdu_data, len, offset);
-  if (r < 0)
-    {
-      DEBUG_INFO ("memory error.\r\n");
-      GPG_MEMORY_FAILURE ();
-      return;
-    }
+  if (challenge)
+    random_bytes_free (challenge);
 
+  challenge = random_bytes_get ();
+  memcpy (res_APDU, challenge, CHALLENGE_LEN);
+  res_APDU_size = CHALLENGE_LEN;
   GPG_SUCCESS ();
-  DEBUG_INFO ("WRITE BINARY done.\r\n");
+  DEBUG_INFO ("GET CHALLENGE done.\r\n");
 }
 
 
@@ -833,12 +1027,17 @@ const struct command cmds[] = {
   { INS_PSO, cmd_pso },
   { INS_RESET_RETRY_COUNTER, cmd_reset_user_password },
   { INS_PGP_GENERATE_ASYMMETRIC_KEY_PAIR, cmd_pgp_gakp },
+  { INS_EXTERNAL_AUTHENTICATE,	            /* Not in OpenPGP card protocol */
+    cmd_external_authenticate },
+  { INS_GET_CHALLENGE, cmd_get_challenge }, /* Not in OpenPGP card protocol */
   { INS_INTERNAL_AUTHENTICATE, cmd_internal_authenticate },
   { INS_SELECT_FILE, cmd_select_file },
   { INS_READ_BINARY, cmd_read_binary },
   { INS_GET_DATA, cmd_get_data },
-  { INS_WRITE_BINARY, cmd_write_binary}, /* Not in OpenPGP card protocol */
+  { INS_WRITE_BINARY, cmd_write_binary},    /* Not in OpenPGP card protocol */
+#if defined(CERTDO_SUPPORT)
   { INS_UPDATE_BINARY, cmd_update_binary }, /* Not in OpenPGP card protocol */
+#endif
   { INS_PUT_DATA, cmd_put_data },
   { INS_PUT_DATA_ODD, cmd_put_data },
 };
@@ -965,7 +1164,9 @@ GPGthread (void *arg)
       else if (m == EV_NOP)
 	continue;
 
+      led_blink (LED_START_COMMAND);
       process_command_apdu ();
+      led_blink (LED_FINISH_COMMAND);
     done:
       chEvtSignal (icc_thread, EV_EXEC_FINISHED);
     }